From 8e87c836734a1fb9a8b99aa5badb7e98cd3a4e32 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Sat, 29 Jun 2019 18:09:40 +0530
Subject: [PATCH 1/9] Unread counter added in popver

---
 .../client/models/UserServiceAccount.js       | 10 +++++
 .../views/serviceAccountSidebarLogin.html     | 41 +++++++++++--------
 .../views/serviceAccountSidebarLogin.js       | 35 ++++++++--------
 app/service-accounts/server/index.js          |  1 +
 .../methods/getLinkedServiceAccounts.js       | 22 ++++++++++
 .../publications/userServiceAccounts.js       | 18 ++++++--
 6 files changed, 88 insertions(+), 39 deletions(-)
 create mode 100644 app/models/client/models/UserServiceAccount.js
 create mode 100644 app/service-accounts/server/methods/getLinkedServiceAccounts.js

diff --git a/app/models/client/models/UserServiceAccount.js b/app/models/client/models/UserServiceAccount.js
new file mode 100644
index 000000000000..39cf7a87b2bd
--- /dev/null
+++ b/app/models/client/models/UserServiceAccount.js
@@ -0,0 +1,10 @@
+import { Base } from './_Base';
+
+class UserServiceAccount extends Base {
+	constructor() {
+		super();
+		this._initModel('user_service_account');
+	}
+}
+
+export default new UserServiceAccount();
\ No newline at end of file
diff --git a/app/service-accounts/client/views/serviceAccountSidebarLogin.html b/app/service-accounts/client/views/serviceAccountSidebarLogin.html
index 4fc8970a3fe3..4f04350952c0 100644
--- a/app/service-accounts/client/views/serviceAccountSidebarLogin.html
+++ b/app/service-accounts/client/views/serviceAccountSidebarLogin.html
@@ -1,26 +1,31 @@
 <template name="serviceAccountSidebarLogin">
 	<div class="rc-popover__column">
 		<ul class="rc-popover__list">
-			{{#if showOwnerAccountLink}}
-				<p>Go back to main account</p>
-				<li class='rc-member-list__user js-login'>
-					{{> avatar username=owner.username}}
-					<div class="rc-member-list__username">
-						{{owner.username}}
-					</div>
-				</li>
+			{{#if loading}}
+				<p>Loading ... </p>
 			{{else}}
-				{{#if hasServiceAccounts}}
-					{{#each users}}
-						<li class='rc-member-list__user js-login'>
-							{{> avatar username=username}}
-							<div class="rc-member-list__username">
-								{{username}}
-							</div>
-						</li>
-					{{/each}}
+				{{#if showOwnerAccountLink}}
+					<p>Go back to main account</p>
+					<li class='rc-member-list__user js-login'>
+						{{> avatar username=owner.username}}
+						<div class="rc-member-list__username">
+							{{owner.username}}
+						</div>
+					</li>
 				{{else}}
-					<p>{{_ "You_have_no_service_accounts"}}</p>
+					{{#if hasServiceAccounts}}
+						{{#each users}}
+							<li class='rc-member-list__user js-login'>
+								{{> avatar username=username}}
+								<div class="rc-member-list__username">
+									{{username}}
+								</div>
+								<span>{{unread}}</span>
+							</li>
+						{{/each}}
+					{{else}}
+						<p>{{_ "You_have_no_service_accounts"}}</p>
+					{{/if}}
 				{{/if}}
 			{{/if}}
 		</ul>
diff --git a/app/service-accounts/client/views/serviceAccountSidebarLogin.js b/app/service-accounts/client/views/serviceAccountSidebarLogin.js
index ee652351b48b..147ad6fc68bb 100644
--- a/app/service-accounts/client/views/serviceAccountSidebarLogin.js
+++ b/app/service-accounts/client/views/serviceAccountSidebarLogin.js
@@ -4,19 +4,18 @@ import { Template } from 'meteor/templating';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 
 import { handleError } from '../../../utils';
-import FullUser from '../../../models/client/models/FullUser';
+import UserServiceAccount from '../../../models/client/models/UserServiceAccount';
 import './serviceAccountSidebarLogin.html';
 
 Template.serviceAccountSidebarLogin.helpers({
-	isReady() {
-		const instance = Template.instance();
-		return instance.ready && instance.ready.get();
+	loading() {
+		return Template.instance().loading.get();
 	},
 	users() {
-		return Template.instance().users();
+		return Template.instance().users.get();
 	},
 	hasServiceAccounts() {
-		return Template.instance().users() && Template.instance().users().length > 0;
+		return Template.instance().users.get() && Template.instance().users.get().length > 0;
 	},
 	owner() {
 		return Meteor.user().u;
@@ -53,19 +52,21 @@ Template.serviceAccountSidebarLogin.events({
 	},
 });
 
-Template.serviceAccountSidebarLogin.onCreated(function() {
+Template.serviceAccountSidebarLogin.onCreated(function () {
 	const instance = this;
 	this.ready = new ReactiveVar(true);
+	this.users = new ReactiveVar([]);
+	this.loading = new ReactiveVar(true);
 	this.autorun(() => {
-		const subscription = instance.subscribe('userServiceAccounts');
-		instance.ready.set(subscription.ready());
+		instance.loading.set(true);
+		Meteor.call('getLinkedServiceAccounts', function (err, serviceAccounts) {
+			if (err) {
+				this.loading.set(false);
+				return handleError(err);
+			}
+			instance.users.set(serviceAccounts);
+			instance.loading.set(false);
+		});
 	});
-	this.users = function() {
-		const query = {
-			'u._id': Meteor.userId(),
-			active: true,
-		};
-		const limit = instance.limit && instance.limit.get();
-		return FullUser.find(query, { limit, sort: { username: 1, name: 1 } }).fetch();
-	};
+	
 });
diff --git a/app/service-accounts/server/index.js b/app/service-accounts/server/index.js
index f6a6fb8418af..c98f74128197 100644
--- a/app/service-accounts/server/index.js
+++ b/app/service-accounts/server/index.js
@@ -6,6 +6,7 @@ import './api/rest';
 import './methods/usernameExists';
 import './methods/addServiceAccount';
 import './methods/getLoginToken';
+import './methods/getLinkedServiceAccounts';
 
 import './hooks/serviceAccountCallback';
 
diff --git a/app/service-accounts/server/methods/getLinkedServiceAccounts.js b/app/service-accounts/server/methods/getLinkedServiceAccounts.js
new file mode 100644
index 000000000000..40fe1f29f410
--- /dev/null
+++ b/app/service-accounts/server/methods/getLinkedServiceAccounts.js
@@ -0,0 +1,22 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Users, Subscriptions } from '../../../models';
+import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
+
+Meteor.methods({
+	getLinkedServiceAccounts() {
+		if (!Meteor.userId()) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'addServiceAccount' });
+		}
+
+		const query = {
+			'u._id': Meteor.userId(),
+			active: true,
+		};
+		const result = Users.find(query, { fields: getDefaultUserFields() }).fetch();
+		result.forEach((serviceAccount) => {
+			serviceAccount.unread = Subscriptions.findUnreadByUserId(serviceAccount._id).count();
+		});
+		return result;
+	},
+});
\ No newline at end of file
diff --git a/app/service-accounts/server/publications/userServiceAccounts.js b/app/service-accounts/server/publications/userServiceAccounts.js
index 19f1ecd9912b..c4c00387f372 100644
--- a/app/service-accounts/server/publications/userServiceAccounts.js
+++ b/app/service-accounts/server/publications/userServiceAccounts.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Users } from '../../../models';
+import { Users, Subscriptions } from '../../../models';
 import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
 
 Meteor.publish('userServiceAccounts', function() {
@@ -14,9 +14,19 @@ Meteor.publish('userServiceAccounts', function() {
 	const handle = Users.find({ 'u._id': this.userId, active: true }, {
 		fields: getDefaultUserFields(),
 	}).observeChanges({
-		added: (_id, record) => this.added('rocketchat_full_user', _id, record),
-		changed: (_id, record) => this.changed('rocketchat_full_user', _id, record),
-		removed: (_id, record) => this.removed('rocketchat_full_user', _id, record),
+		added: (id, fields) => {
+			const unread = Subscriptions.findUnreadByUserId(id);
+			fields.unread = unread;
+			this.added('rocketchat_user_service_account', id, fields);
+		},
+
+		changed: (id, fields) => {
+			this.changed('rocketchat_user_service_account', id, fields);
+		},
+
+		removed: (id) => {
+			this.removed('rocketchat_user_service_account', id);
+		},
 	});
 
 	this.ready();

From 5a28d4125177545b9373c80a23afeba1a57a6d8e Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Mon, 1 Jul 2019 20:37:11 +0530
Subject: [PATCH 2/9] Get linked service account method added

---
 .../client/models/UserServiceAccount.js       | 10 ------
 .../views/serviceAccountSidebarLogin.html     |  1 -
 .../views/serviceAccountSidebarLogin.js       |  6 ++--
 app/service-accounts/server/index.js          |  1 -
 .../methods/getLinkedServiceAccounts.js       |  2 +-
 .../publications/userServiceAccounts.js       | 35 -------------------
 6 files changed, 3 insertions(+), 52 deletions(-)
 delete mode 100644 app/models/client/models/UserServiceAccount.js
 delete mode 100644 app/service-accounts/server/publications/userServiceAccounts.js

diff --git a/app/models/client/models/UserServiceAccount.js b/app/models/client/models/UserServiceAccount.js
deleted file mode 100644
index 39cf7a87b2bd..000000000000
--- a/app/models/client/models/UserServiceAccount.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Base } from './_Base';
-
-class UserServiceAccount extends Base {
-	constructor() {
-		super();
-		this._initModel('user_service_account');
-	}
-}
-
-export default new UserServiceAccount();
\ No newline at end of file
diff --git a/app/service-accounts/client/views/serviceAccountSidebarLogin.html b/app/service-accounts/client/views/serviceAccountSidebarLogin.html
index 4f04350952c0..914863701fd6 100644
--- a/app/service-accounts/client/views/serviceAccountSidebarLogin.html
+++ b/app/service-accounts/client/views/serviceAccountSidebarLogin.html
@@ -20,7 +20,6 @@
 								<div class="rc-member-list__username">
 									{{username}}
 								</div>
-								<span>{{unread}}</span>
 							</li>
 						{{/each}}
 					{{else}}
diff --git a/app/service-accounts/client/views/serviceAccountSidebarLogin.js b/app/service-accounts/client/views/serviceAccountSidebarLogin.js
index 147ad6fc68bb..98a86d213ba5 100644
--- a/app/service-accounts/client/views/serviceAccountSidebarLogin.js
+++ b/app/service-accounts/client/views/serviceAccountSidebarLogin.js
@@ -4,7 +4,6 @@ import { Template } from 'meteor/templating';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 
 import { handleError } from '../../../utils';
-import UserServiceAccount from '../../../models/client/models/UserServiceAccount';
 import './serviceAccountSidebarLogin.html';
 
 Template.serviceAccountSidebarLogin.helpers({
@@ -52,14 +51,14 @@ Template.serviceAccountSidebarLogin.events({
 	},
 });
 
-Template.serviceAccountSidebarLogin.onCreated(function () {
+Template.serviceAccountSidebarLogin.onCreated(function() {
 	const instance = this;
 	this.ready = new ReactiveVar(true);
 	this.users = new ReactiveVar([]);
 	this.loading = new ReactiveVar(true);
 	this.autorun(() => {
 		instance.loading.set(true);
-		Meteor.call('getLinkedServiceAccounts', function (err, serviceAccounts) {
+		Meteor.call('getLinkedServiceAccounts', function(err, serviceAccounts) {
 			if (err) {
 				this.loading.set(false);
 				return handleError(err);
@@ -68,5 +67,4 @@ Template.serviceAccountSidebarLogin.onCreated(function () {
 			instance.loading.set(false);
 		});
 	});
-	
 });
diff --git a/app/service-accounts/server/index.js b/app/service-accounts/server/index.js
index c98f74128197..decd703e9cda 100644
--- a/app/service-accounts/server/index.js
+++ b/app/service-accounts/server/index.js
@@ -11,4 +11,3 @@ import './methods/getLinkedServiceAccounts';
 import './hooks/serviceAccountCallback';
 
 import './publications/fullServiceAccountData';
-import './publications/userServiceAccounts';
diff --git a/app/service-accounts/server/methods/getLinkedServiceAccounts.js b/app/service-accounts/server/methods/getLinkedServiceAccounts.js
index 40fe1f29f410..82390927adee 100644
--- a/app/service-accounts/server/methods/getLinkedServiceAccounts.js
+++ b/app/service-accounts/server/methods/getLinkedServiceAccounts.js
@@ -19,4 +19,4 @@ Meteor.methods({
 		});
 		return result;
 	},
-});
\ No newline at end of file
+});
diff --git a/app/service-accounts/server/publications/userServiceAccounts.js b/app/service-accounts/server/publications/userServiceAccounts.js
deleted file mode 100644
index c4c00387f372..000000000000
--- a/app/service-accounts/server/publications/userServiceAccounts.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { Users, Subscriptions } from '../../../models';
-import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
-
-Meteor.publish('userServiceAccounts', function() {
-	if (!this.userId) {
-		return this.ready();
-	}
-
-	if (Meteor.user().u) {
-		return this.ready();
-	}
-	const handle = Users.find({ 'u._id': this.userId, active: true }, {
-		fields: getDefaultUserFields(),
-	}).observeChanges({
-		added: (id, fields) => {
-			const unread = Subscriptions.findUnreadByUserId(id);
-			fields.unread = unread;
-			this.added('rocketchat_user_service_account', id, fields);
-		},
-
-		changed: (id, fields) => {
-			this.changed('rocketchat_user_service_account', id, fields);
-		},
-
-		removed: (id) => {
-			this.removed('rocketchat_user_service_account', id);
-		},
-	});
-
-	this.ready();
-
-	this.onStop(() => handle.stop());
-});

From a0ca489a13d1c251d645f49e454873c993c80f77 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Tue, 9 Jul 2019 00:52:09 +0530
Subject: [PATCH 3/9] Added unread counter

---
 .../client/stylesheets/serviceAccounts.css    | 36 +++++++++++++++++++
 .../views/serviceAccountSidebarLogin.html     | 11 +++---
 client/importsCss.js                          |  1 +
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 app/service-accounts/client/stylesheets/serviceAccounts.css

diff --git a/app/service-accounts/client/stylesheets/serviceAccounts.css b/app/service-accounts/client/stylesheets/serviceAccounts.css
new file mode 100644
index 000000000000..b30a69a4c676
--- /dev/null
+++ b/app/service-accounts/client/stylesheets/serviceAccounts.css
@@ -0,0 +1,36 @@
+.rc-service-account-list {
+
+	&__user {
+
+		display: flex;
+
+		padding: 8px 0;
+
+		cursor: pointer;
+		align-items: center;
+
+		&.active,
+		&:hover {
+			background-color: #eeeeee;
+
+			& .rc-member-list__menu {
+				opacity: 1;
+			}
+		}
+
+		& > .avatar {
+			width: var(--sidebar-account-thumb-size);
+			height: var(--sidebar-account-thumb-size);
+		}
+	}
+
+	&__username {
+		display: flex;
+		flex: 1 1 auto;
+
+		margin: 0 12px 0 8px;
+
+		font-size: 16px;
+		align-items: center;
+	}
+}
\ No newline at end of file
diff --git a/app/service-accounts/client/views/serviceAccountSidebarLogin.html b/app/service-accounts/client/views/serviceAccountSidebarLogin.html
index 914863701fd6..45dc2e92726d 100644
--- a/app/service-accounts/client/views/serviceAccountSidebarLogin.html
+++ b/app/service-accounts/client/views/serviceAccountSidebarLogin.html
@@ -6,20 +6,23 @@
 			{{else}}
 				{{#if showOwnerAccountLink}}
 					<p>Go back to main account</p>
-					<li class='rc-member-list__user js-login'>
+					<li class='rc-service-account-list__user js-login'>
 						{{> avatar username=owner.username}}
-						<div class="rc-member-list__username">
+						<div class="rc-service-account-list__username">
 							{{owner.username}}
 						</div>
 					</li>
 				{{else}}
 					{{#if hasServiceAccounts}}
 						{{#each users}}
-							<li class='rc-member-list__user js-login'>
+							<li class='rc-service-account-list__user js-login'>
 								{{> avatar username=username}}
-								<div class="rc-member-list__username">
+								<div class="rc-service-account-list__username">
 									{{username}}
 								</div>
+								<div class="badge">
+									{{unread}}
+								</div>
 							</li>
 						{{/each}}
 					{{else}}
diff --git a/client/importsCss.js b/client/importsCss.js
index d723973c6a22..67b9f90a3407 100644
--- a/client/importsCss.js
+++ b/client/importsCss.js
@@ -39,3 +39,4 @@ import '../app/ui-vrecord/client/vrecord.css';
 import '../app/videobridge/client/stylesheets/video.less';
 import '../app/wordpress/client/wordpress-login-button.css';
 import '../app/katex/katex.min.css';
+import '../app/service-accounts/client/stylesheets/serviceAccounts.css';
\ No newline at end of file

From 38c26308d1dbbd0265dc4b593516a805fa0e1b37 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 10 Jul 2019 18:53:33 +0530
Subject: [PATCH 4/9] Fixed CLI errors

---
 app/service-accounts/client/stylesheets/serviceAccounts.css | 3 +--
 client/importsCss.js                                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/service-accounts/client/stylesheets/serviceAccounts.css b/app/service-accounts/client/stylesheets/serviceAccounts.css
index b30a69a4c676..c9d0fd705505 100644
--- a/app/service-accounts/client/stylesheets/serviceAccounts.css
+++ b/app/service-accounts/client/stylesheets/serviceAccounts.css
@@ -1,5 +1,4 @@
 .rc-service-account-list {
-
 	&__user {
 
 		display: flex;
@@ -33,4 +32,4 @@
 		font-size: 16px;
 		align-items: center;
 	}
-}
\ No newline at end of file
+}
diff --git a/client/importsCss.js b/client/importsCss.js
index 67b9f90a3407..1c6ba6b1deec 100644
--- a/client/importsCss.js
+++ b/client/importsCss.js
@@ -39,4 +39,4 @@ import '../app/ui-vrecord/client/vrecord.css';
 import '../app/videobridge/client/stylesheets/video.less';
 import '../app/wordpress/client/wordpress-login-button.css';
 import '../app/katex/katex.min.css';
-import '../app/service-accounts/client/stylesheets/serviceAccounts.css';
\ No newline at end of file
+import '../app/service-accounts/client/stylesheets/serviceAccounts.css';

From fab9cb029dd29f7a36397e727d926f06f84f7b48 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 17 Jul 2019 12:33:21 +0530
Subject: [PATCH 5/9] Service account message alert added

---
 .../functions/notifications/serviceAccount.js | 32 +++++++++++++++++++
 .../server/lib/sendNotificationsOnMessage.js  | 15 +++++++++
 .../client/stylesheets/serviceAccounts.css    |  8 +++++
 .../views/serviceAccountSidebarLogin.html     |  8 ++++-
 .../views/serviceAccountSidebarLogin.js       | 11 +++++++
 app/ui-sidenav/client/sidebarHeader.html      | 10 ++++--
 app/ui-sidenav/client/sidebarHeader.js        |  2 ++
 client/notifications/notification.js          |  5 +++
 8 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 app/lib/server/functions/notifications/serviceAccount.js

diff --git a/app/lib/server/functions/notifications/serviceAccount.js b/app/lib/server/functions/notifications/serviceAccount.js
new file mode 100644
index 000000000000..bae9901a5422
--- /dev/null
+++ b/app/lib/server/functions/notifications/serviceAccount.js
@@ -0,0 +1,32 @@
+import { metrics } from '../../../../metrics';
+import { settings } from '../../../../settings';
+import { Notifications } from '../../../../notifications';
+
+export function shouldNotifyServiceAccountOwner({
+	statusConnection,
+	hasMentionToAll,
+	hasMentionToHere,
+	isHighlighted,
+	hasMentionToUser,
+	hasReplyToThread,
+	roomType,
+}) {
+	if (statusConnection === 'online') {
+		return false;
+	}
+	return roomType === 'd' || hasMentionToAll || hasMentionToHere || isHighlighted || hasMentionToUser || hasReplyToThread;
+}
+
+export function notifyServiceAccountOwner(receiver, ownerId, message, room) {
+	metrics.notificationsSent.inc({ notification_type: 'sa' });
+	Notifications.notifyUser(ownerId, 'sa-notification', {
+		payload: {
+			_id: message._id,
+			rid: message.rid,
+			sender: message.u,
+			receiver: receiver.username,
+			type: room.t,
+			name: room.name,
+		},
+	});
+}
\ No newline at end of file
diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
index db544f058509..ddda261a0537 100644
--- a/app/lib/server/lib/sendNotificationsOnMessage.js
+++ b/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -11,6 +11,7 @@ import { sendEmail, shouldNotifyEmail } from '../functions/notifications/email';
 import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/mobile';
 import { notifyDesktopUser, shouldNotifyDesktop } from '../functions/notifications/desktop';
 import { notifyAudioUser, shouldNotifyAudio } from '../functions/notifications/audio';
+import { notifyServiceAccountOwner, shouldNotifyServiceAccountOwner } from '../functions/notifications/serviceAccount';
 
 export const sendNotification = async ({
 	subscription,
@@ -46,6 +47,7 @@ export const sendNotification = async ({
 					status: 1,
 					statusConnection: 1,
 					username: 1,
+					u: 1,
 				},
 			}),
 		];
@@ -149,6 +151,18 @@ export const sendNotification = async ({
 			return false;
 		});
 	}
+
+	if (receiver.u && shouldNotifyServiceAccountOwner({
+		statusConnection: receiver.statusConnection,
+		hasMentionToAll,
+		hasMentionToHere,
+		isHighlighted,
+		hasMentionToUser,
+		hasReplyToThread,
+		roomType,
+	})) {
+		notifyServiceAccountOwner(receiver, receiver.u._id, message, room);
+	}
 };
 
 const project = {
@@ -168,6 +182,7 @@ const project = {
 		'receiver.status': 1,
 		'receiver.statusConnection': 1,
 		'receiver.username': 1,
+		'receiver.u': 1,
 	},
 };
 
diff --git a/app/service-accounts/client/stylesheets/serviceAccounts.css b/app/service-accounts/client/stylesheets/serviceAccounts.css
index c9d0fd705505..84a97eaad925 100644
--- a/app/service-accounts/client/stylesheets/serviceAccounts.css
+++ b/app/service-accounts/client/stylesheets/serviceAccounts.css
@@ -32,4 +32,12 @@
 		font-size: 16px;
 		align-items: center;
 	}
+
+	&__username-alert {
+		font-weight: bold;
+	}
 }
+
+.service-account-notification {
+	color: var(--rc-color-alert-message-primary-background);
+}
\ No newline at end of file
diff --git a/app/service-accounts/client/views/serviceAccountSidebarLogin.html b/app/service-accounts/client/views/serviceAccountSidebarLogin.html
index 45dc2e92726d..f5a8b22fe5cd 100644
--- a/app/service-accounts/client/views/serviceAccountSidebarLogin.html
+++ b/app/service-accounts/client/views/serviceAccountSidebarLogin.html
@@ -18,7 +18,13 @@
 							<li class='rc-service-account-list__user js-login'>
 								{{> avatar username=username}}
 								<div class="rc-service-account-list__username">
-									{{username}}
+									{{#if receivedNewMessage username}}
+										<span class="rc-service-account-list__username-alert">
+											{{username}}
+										</span>
+									{{else}}
+										{{username}}
+									{{/if}}
 								</div>
 								<div class="badge">
 									{{unread}}
diff --git a/app/service-accounts/client/views/serviceAccountSidebarLogin.js b/app/service-accounts/client/views/serviceAccountSidebarLogin.js
index 98a86d213ba5..86a0a7e2805a 100644
--- a/app/service-accounts/client/views/serviceAccountSidebarLogin.js
+++ b/app/service-accounts/client/views/serviceAccountSidebarLogin.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Session } from 'meteor/session';
 
 import { handleError } from '../../../utils';
 import './serviceAccountSidebarLogin.html';
@@ -22,6 +23,12 @@ Template.serviceAccountSidebarLogin.helpers({
 	showOwnerAccountLink() {
 		return localStorage.getItem('serviceAccountForceLogin') && !!Meteor.user().u;
 	},
+	receivedNewMessage(username) {
+		if (Template.instance().notifiedServiceAccount) {
+			return username === Template.instance().notifiedServiceAccount.get();
+		}
+		return false;
+	},
 });
 
 Template.serviceAccountSidebarLogin.events({
@@ -56,6 +63,10 @@ Template.serviceAccountSidebarLogin.onCreated(function() {
 	this.ready = new ReactiveVar(true);
 	this.users = new ReactiveVar([]);
 	this.loading = new ReactiveVar(true);
+	this.notifiedServiceAccount = new ReactiveVar("");
+	instance.notifiedServiceAccount.set(Session.get('saMessageReceiver'));
+	Session.delete('saMessageReceiver');
+	Session.delete('saNotification');
 	this.autorun(() => {
 		instance.loading.set(true);
 		Meteor.call('getLinkedServiceAccounts', function(err, serviceAccounts) {
diff --git a/app/ui-sidenav/client/sidebarHeader.html b/app/ui-sidenav/client/sidebarHeader.html
index 5a34a677bc91..6fd3a7106283 100644
--- a/app/ui-sidenav/client/sidebarHeader.html
+++ b/app/ui-sidenav/client/sidebarHeader.html
@@ -7,8 +7,14 @@
 			</div>
 			<div class="sidebar__toolbar">
 				{{#each toolbarButtons}}
-					<button class="sidebar__toolbar-button rc-tooltip rc-tooltip--down js-button" aria-label="{{name}}">
-						{{> icon block="sidebar__toolbar-button-icon" icon=icon }}
+					<button class=" sidebar__toolbar-button  rc-tooltip rc-tooltip--down js-button" aria-label="{{name}}">
+						{{#if active}} 
+							<span class="service-account-notification">
+								{{> icon block="sidebar__toolbar-button-icon" icon=icon }}
+							</span>
+						{{else}}
+							{{> icon block="sidebar__toolbar-button-icon" icon=icon }}
+						{{/if}}
 					</button>
 				{{/each}}
 			</div>
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index ed2de621991f..5c4b7286d65d 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
+import { Session } from 'meteor/session';
 
 import { popover, AccountBox, menu, SideNav, modal } from '../../ui-utils';
 import { t, getUserPreference, handleError } from '../../utils';
@@ -74,6 +75,7 @@ const toolbarButtons = (user) => [{
 {
 	name: t('Service_account_login'),
 	icon: 'reload',
+	active: Session.get('saNotification'),
 	condition: () => !Meteor.user().u || (Meteor.user().u && localStorage.getItem('serviceAccountForceLogin')),
 	action: (e) => {
 		const options = [];
diff --git a/client/notifications/notification.js b/client/notifications/notification.js
index ca374de48165..619f2c10a1f6 100644
--- a/client/notifications/notification.js
+++ b/client/notifications/notification.js
@@ -82,6 +82,11 @@ Meteor.startup(function() {
 			Notifications.onUser('subscriptions-changed', (action, sub) => {
 				notifyNewRoom(sub);
 			});
+
+			Notifications.onUser('sa-notification', (notification) => {
+				Session.set('saNotification', true);
+				Session.set('saMessageReceiver', notification.payload.receiver);
+			});
 		}
 	});
 });

From 6b7082c619a35570fac67937adfcfdc9263e93ec Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 17 Jul 2019 12:44:17 +0530
Subject: [PATCH 6/9] Lint errors fixed

---
 app/lib/server/functions/notifications/serviceAccount.js       | 3 +--
 app/service-accounts/client/stylesheets/serviceAccounts.css    | 2 +-
 .../client/views/serviceAccountSidebarLogin.js                 | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/lib/server/functions/notifications/serviceAccount.js b/app/lib/server/functions/notifications/serviceAccount.js
index bae9901a5422..92d45270ffe8 100644
--- a/app/lib/server/functions/notifications/serviceAccount.js
+++ b/app/lib/server/functions/notifications/serviceAccount.js
@@ -1,5 +1,4 @@
 import { metrics } from '../../../../metrics';
-import { settings } from '../../../../settings';
 import { Notifications } from '../../../../notifications';
 
 export function shouldNotifyServiceAccountOwner({
@@ -29,4 +28,4 @@ export function notifyServiceAccountOwner(receiver, ownerId, message, room) {
 			name: room.name,
 		},
 	});
-}
\ No newline at end of file
+}
diff --git a/app/service-accounts/client/stylesheets/serviceAccounts.css b/app/service-accounts/client/stylesheets/serviceAccounts.css
index 84a97eaad925..4f7b1103f5df 100644
--- a/app/service-accounts/client/stylesheets/serviceAccounts.css
+++ b/app/service-accounts/client/stylesheets/serviceAccounts.css
@@ -40,4 +40,4 @@
 
 .service-account-notification {
 	color: var(--rc-color-alert-message-primary-background);
-}
\ No newline at end of file
+}
diff --git a/app/service-accounts/client/views/serviceAccountSidebarLogin.js b/app/service-accounts/client/views/serviceAccountSidebarLogin.js
index 86a0a7e2805a..beb2d47c47c8 100644
--- a/app/service-accounts/client/views/serviceAccountSidebarLogin.js
+++ b/app/service-accounts/client/views/serviceAccountSidebarLogin.js
@@ -63,7 +63,7 @@ Template.serviceAccountSidebarLogin.onCreated(function() {
 	this.ready = new ReactiveVar(true);
 	this.users = new ReactiveVar([]);
 	this.loading = new ReactiveVar(true);
-	this.notifiedServiceAccount = new ReactiveVar("");
+	this.notifiedServiceAccount = new ReactiveVar('');
 	instance.notifiedServiceAccount.set(Session.get('saMessageReceiver'));
 	Session.delete('saMessageReceiver');
 	Session.delete('saNotification');

From 5e121d70936fffa50ab08cddc45bae01e181c603 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 17 Jul 2019 18:03:27 +0530
Subject: [PATCH 7/9] Service Account Notification fixed

---
 app/lib/server/functions/notifications/serviceAccount.js | 4 ----
 app/lib/server/lib/sendNotificationsOnMessage.js         | 1 -
 2 files changed, 5 deletions(-)

diff --git a/app/lib/server/functions/notifications/serviceAccount.js b/app/lib/server/functions/notifications/serviceAccount.js
index 92d45270ffe8..3776989c063b 100644
--- a/app/lib/server/functions/notifications/serviceAccount.js
+++ b/app/lib/server/functions/notifications/serviceAccount.js
@@ -2,7 +2,6 @@ import { metrics } from '../../../../metrics';
 import { Notifications } from '../../../../notifications';
 
 export function shouldNotifyServiceAccountOwner({
-	statusConnection,
 	hasMentionToAll,
 	hasMentionToHere,
 	isHighlighted,
@@ -10,9 +9,6 @@ export function shouldNotifyServiceAccountOwner({
 	hasReplyToThread,
 	roomType,
 }) {
-	if (statusConnection === 'online') {
-		return false;
-	}
 	return roomType === 'd' || hasMentionToAll || hasMentionToHere || isHighlighted || hasMentionToUser || hasReplyToThread;
 }
 
diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
index ddda261a0537..0c37d2165110 100644
--- a/app/lib/server/lib/sendNotificationsOnMessage.js
+++ b/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -153,7 +153,6 @@ export const sendNotification = async ({
 	}
 
 	if (receiver.u && shouldNotifyServiceAccountOwner({
-		statusConnection: receiver.statusConnection,
 		hasMentionToAll,
 		hasMentionToHere,
 		isHighlighted,

From b133c36ca115023f491b26cb26284739812dc220 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 21 Aug 2019 14:45:27 +0530
Subject: [PATCH 8/9] Sidebar header condition modified

---
 app/ui-sidenav/client/sidebarHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index 5c4b7286d65d..44f268147ab3 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -76,7 +76,7 @@ const toolbarButtons = (user) => [{
 	name: t('Service_account_login'),
 	icon: 'reload',
 	active: Session.get('saNotification'),
-	condition: () => !Meteor.user().u || (Meteor.user().u && localStorage.getItem('serviceAccountForceLogin')),
+	condition: () => (Meteor.user() && !Meteor.user().u) || (Meteor.user() && Meteor.user().u && localStorage.getItem('serviceAccountForceLogin')),
 	action: (e) => {
 		const options = [];
 		const config = {

From d9e25f9cd6e945c524a3dd953f905d4c620baeff Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Sat, 24 Aug 2019 23:33:27 +0530
Subject: [PATCH 9/9] Service Account transfer complete

---
 app/models/server/models/Users.js             | 14 ++++
 app/service-accounts/client/index.js          |  4 +-
 .../client/views/accountServiceAccounts.html  | 76 +++++++++++++++++++
 .../client/views/accountServiceAccounts.js    | 58 ++++++++++++++
 .../client/views/serviceAccountTransfer.html  | 23 ++++++
 .../client/views/serviceAccountTransfer.js    | 44 +++++++++++
 app/service-accounts/server/config.js         |  6 ++
 app/service-accounts/server/index.js          |  1 +
 .../methods/getLinkedServiceAccounts.js       |  3 +-
 .../server/methods/transferServiceAccount.js  | 29 +++++++
 app/ui-account/client/accountFlex.html        |  3 +
 app/ui-account/client/accountFlex.js          |  3 +
 packages/rocketchat-i18n/i18n/en.i18n.json    |  3 +
 13 files changed, 264 insertions(+), 3 deletions(-)
 create mode 100644 app/service-accounts/client/views/accountServiceAccounts.html
 create mode 100644 app/service-accounts/client/views/accountServiceAccounts.js
 create mode 100644 app/service-accounts/client/views/serviceAccountTransfer.html
 create mode 100644 app/service-accounts/client/views/serviceAccountTransfer.js
 create mode 100644 app/service-accounts/server/methods/transferServiceAccount.js

diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index 78b5b37c0482..609b8105d201 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -1166,6 +1166,20 @@ export class Users extends Base {
 		return this.update(query, update, { multi: true });
 	}
 
+	setOwnerByServiceAccountUsername(serviceAccount, newOwner) {
+		const query = {
+			username: serviceAccount,
+		};
+
+		const update = {
+			$set: {
+				u: newOwner,
+			},
+		};
+
+		return this.update(query, update);
+	}
+
 	// INSERT
 	create(data) {
 		const user = {
diff --git a/app/service-accounts/client/index.js b/app/service-accounts/client/index.js
index 35078e74e4c0..6a18530447e1 100644
--- a/app/service-accounts/client/index.js
+++ b/app/service-accounts/client/index.js
@@ -5,6 +5,8 @@ import './route';
 import './views/serviceAccountDashboard';
 import './views/creationDialog/createServiceAccount';
 import './views/serviceAccountsList';
+import './views/serviceAccountSidebarLogin';
+import './views/accountServiceAccounts';
+import './views/serviceAccountTransfer';
 
 import '../lib/serviceAccountRoomType';
-import './views/serviceAccountSidebarLogin';
diff --git a/app/service-accounts/client/views/accountServiceAccounts.html b/app/service-accounts/client/views/accountServiceAccounts.html
new file mode 100644
index 000000000000..82a64bfdb8a1
--- /dev/null
+++ b/app/service-accounts/client/views/accountServiceAccounts.html
@@ -0,0 +1,76 @@
+<template name="accountServiceaccounts">
+	<div class="main-content-flex">
+        <section class="page-container page-home page-static page-settings content-background-color">
+            {{> header sectionName="Your Service Accounts"}}
+            <div class="content">
+                <div class="results">
+					{{{_ "Showing_results" users.length}}}
+				</div>
+				{{#table fixed='true' onScroll=onTableScroll onResize=onTableResize}}
+					<thead>
+						<tr>
+							<th width="20%">
+								<div class="table-fake-th">{{_ "Name"}}</div>
+							</th>
+							<th width="20%">
+								<div class="table-fake-th">{{_ "Username"}}</div>
+							</th>
+							<th width="40%">
+								<div class="table-fake-th">{{_ "Description"}}</div>
+							</th>
+							<th width="10%">
+								<div class="table-fake-th">{{_ "Transfer"}}</div>
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+						{{#unless hasServiceAccounts}}
+							<tr>
+								<td colspan="5" class="empty-role">{{_ "You_have_no_service_accounts"}}</td>
+							</tr>
+						{{/unless}}
+						{{#each users}}
+						<tr class='user-info'>
+							<td width="30%">
+								<div class="rc-table-wrapper">
+									<div class="rc-table-avatar">
+										{{> avatar username=username}}
+									</div>
+									<div class="rc-table-info">
+										<span class="rc-table-title">{{username}}</span>
+									</div>
+								</div>
+							</td>
+							<td width="20%">
+								<div class="rc-table-wrapper">
+									<div class="rc-table-info">
+										<span class="rc-table-title">{{username}}</span>
+									</div>
+								</div>
+							</td>
+							<td width="40%">
+								<div class="rc-table-wrapper">
+									<div class="rc-table-info">
+										<span class="rc-table-title">{{description}}</span>
+									</div>
+								</div>
+							</td>
+							<td width="10%">
+								<div class="rc-table-wrapper">
+									<div class="rc-table-info">
+										<span class="rc-table-title"><a class="js-transfer">{{_"Transfer"}}</a></span>
+									</div>
+								</div>
+							</td>
+						</tr>
+						{{/each}} {{#unless loading}}
+						<tr class="table-no-click">
+							<td class="table-loading-td" colspan="{{#if showLastMessage}}5{{else}}4{{/if}}">{{> loading}}</td>
+						</tr>
+						{{/unless}}
+					</tbody>
+				{{/table}}
+            </div>
+        </section>
+    </div>
+</template> 
\ No newline at end of file
diff --git a/app/service-accounts/client/views/accountServiceAccounts.js b/app/service-accounts/client/views/accountServiceAccounts.js
new file mode 100644
index 000000000000..76b41979390e
--- /dev/null
+++ b/app/service-accounts/client/views/accountServiceAccounts.js
@@ -0,0 +1,58 @@
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Meteor } from 'meteor/meteor';
+
+import './accountServiceAccounts.html';
+import { t, handleError } from '../../../utils';
+import { modal } from '../../../ui-utils';
+
+Template.accountServiceaccounts.helpers({
+	loading() {
+		return Template.instance().loading.get();
+	},
+	users() {
+		return Template.instance().users.get();
+	},
+	hasServiceAccounts() {
+		return Template.instance().users.get() && Template.instance().users.get().length > 0;
+	},
+});
+
+Template.accountServiceaccounts.events({
+	'click .js-transfer'(e) {
+		e.preventDefault();
+		modal.open({
+			title: t('Service_account_transfer'),
+			content: 'serviceAccountTransfer',
+			data: {
+				onCreate() {
+					modal.close();
+				},
+				serviceAccount: this.username,
+			},
+			modifier: 'modal',
+			showConfirmButton: false,
+			showCancelButton: false,
+			confirmOnEnter: false,
+		});
+	},
+});
+
+
+Template.accountServiceaccounts.onCreated(function() {
+	const instance = this;
+	this.ready = new ReactiveVar(true);
+	this.users = new ReactiveVar([]);
+	this.loading = new ReactiveVar(true);
+	this.autorun(() => {
+		instance.loading.set(true);
+		Meteor.call('getLinkedServiceAccounts', function(err, serviceAccounts) {
+			if (err) {
+				instance.loading.set(false);
+				return handleError(err);
+			}
+			instance.users.set(serviceAccounts);
+			instance.loading.set(false);
+		});
+	});
+});
diff --git a/app/service-accounts/client/views/serviceAccountTransfer.html b/app/service-accounts/client/views/serviceAccountTransfer.html
new file mode 100644
index 000000000000..f99cc05d3948
--- /dev/null
+++ b/app/service-accounts/client/views/serviceAccountTransfer.html
@@ -0,0 +1,23 @@
+<template name="serviceAccountTransfer">
+    <section class="create-channel">
+        <div class="create-channel__wrapper">
+            <p class="create-channel__description">{{_ "Service_account_transfer_description"}}</p>
+            <form id="create-service-account" name="create-service-account" class="create-channel__content">
+                <div class="create-channel__inputs">
+                    <div class="rc-input {{#if invalidChannel}}rc-input--error{{/if}}">
+						<label class="rc-input__label">
+							<div class="rc-input__title">{{_ "Username"}}</div>
+							<div class="rc-input__wrapper">
+								<input name="username" type="text" class="rc-input__element"
+									   placeholder="{{_ 'Username'}}" autofocus>
+							</div>
+						</label>
+					</div>
+				</div>
+            </form>
+            <div class="create-channel__inputs">
+				<input form='create-service-account' class="rc-button rc-button--primary" type='submit' data-button="create" {{transferIsDisabled}} value="{{_ "Transfer"}}" />
+			</div>
+        </div>
+    </section>
+</template>
\ No newline at end of file
diff --git a/app/service-accounts/client/views/serviceAccountTransfer.js b/app/service-accounts/client/views/serviceAccountTransfer.js
new file mode 100644
index 000000000000..48c17675712f
--- /dev/null
+++ b/app/service-accounts/client/views/serviceAccountTransfer.js
@@ -0,0 +1,44 @@
+import { Template } from 'meteor/templating';
+import toastr from 'toastr';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Meteor } from 'meteor/meteor';
+
+import { t, handleError } from '../../../utils';
+import { modal } from '../../../ui-utils';
+import './serviceAccountTransfer.html';
+
+Template.serviceAccountTransfer.helpers({
+	transferIsDisabled() {
+		const username = Template.instance().username.get();
+		if (username.length === 0) {
+			return 'disabled';
+		}
+		return '';
+	},
+});
+
+Template.serviceAccountTransfer.events({
+	'input [name="username"]'(e, t) {
+		const { value } = e.target;
+		t.username.set(value.trim());
+	},
+	async 'submit #create-service-account'(event, instance) {
+		event.preventDefault();
+		event.stopPropagation();
+		const username = instance.username.get();
+		const { serviceAccount } = instance.data;
+		Meteor.call('transferServiceAccount', serviceAccount, username, (error) => {
+			if (error) {
+				return handleError(error);
+			}
+			toastr.success(t('Service_account_transferred_successfully'));
+			modal.close();
+			FlowRouter.go('home');
+		});
+	},
+});
+
+Template.serviceAccountTransfer.onCreated(function() {
+	this.username = new ReactiveVar('');
+});
diff --git a/app/service-accounts/server/config.js b/app/service-accounts/server/config.js
index ff4116d3edd2..5ff3b52ea47f 100644
--- a/app/service-accounts/server/config.js
+++ b/app/service-accounts/server/config.js
@@ -24,6 +24,12 @@ Meteor.startup(() => {
 			type: 'boolean',
 			public: true,
 		});
+		this.add('Service_Accounts_TransferEnabled', true, {
+			group: 'Service Accounts',
+			i18nLabel: 'Service_Accounts_TransferEnabled',
+			type: 'boolean',
+			public: true,
+		});
 	});
 	settings.add('Accounts_Default_User_Preferences_sidebarShowServiceAccounts', true, {
 		group: 'Accounts',
diff --git a/app/service-accounts/server/index.js b/app/service-accounts/server/index.js
index 30b2f26eea13..1d49c8ec24f4 100644
--- a/app/service-accounts/server/index.js
+++ b/app/service-accounts/server/index.js
@@ -7,6 +7,7 @@ import './methods/usernameExists';
 import './methods/addServiceAccount';
 import './methods/getLoginToken';
 import './methods/getLinkedServiceAccounts';
+import './methods/transferServiceAccount';
 
 import './hooks/serviceAccountCallback';
 import './hooks/serviceAccountBroadcast';
diff --git a/app/service-accounts/server/methods/getLinkedServiceAccounts.js b/app/service-accounts/server/methods/getLinkedServiceAccounts.js
index 82390927adee..54189f500f3d 100644
--- a/app/service-accounts/server/methods/getLinkedServiceAccounts.js
+++ b/app/service-accounts/server/methods/getLinkedServiceAccounts.js
@@ -1,7 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
 import { Users, Subscriptions } from '../../../models';
-import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
 
 Meteor.methods({
 	getLinkedServiceAccounts() {
@@ -13,7 +12,7 @@ Meteor.methods({
 			'u._id': Meteor.userId(),
 			active: true,
 		};
-		const result = Users.find(query, { fields: getDefaultUserFields() }).fetch();
+		const result = Users.find(query).fetch();
 		result.forEach((serviceAccount) => {
 			serviceAccount.unread = Subscriptions.findUnreadByUserId(serviceAccount._id).count();
 		});
diff --git a/app/service-accounts/server/methods/transferServiceAccount.js b/app/service-accounts/server/methods/transferServiceAccount.js
new file mode 100644
index 000000000000..640539ff20d0
--- /dev/null
+++ b/app/service-accounts/server/methods/transferServiceAccount.js
@@ -0,0 +1,29 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Users } from '../../../models';
+import { settings } from '../../../settings';
+
+Meteor.methods({
+	transferServiceAccount(serviceAccountUsername, newOwnerUsername) {
+		if (!Meteor.userId()) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'transferServiceAccount' });
+		}
+
+		const currOwner = Meteor.user();
+		const serviceAccount = Users.findOneByUsername(serviceAccountUsername, {});
+		if (serviceAccount.u._id !== currOwner._id) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'transferServiceAccount' });
+		}
+		const newOwner = Users.findOneByUsername(newOwnerUsername, { fields: { username: 1 } });
+		if (!newOwner) {
+			throw new Meteor.Error('User_not_found', 'User not found', { method: 'transferServiceAccount' });
+		}
+		const query = { 'u._id': newOwner._id };
+		const count = Users.find(query).count();
+		if (count >= settings.get('Service_account_limit')) {
+			throw new Meteor.Error('service-account-limit-reached', 'Max service account limit reached', { method: 'transferServiceAccount' });
+		}
+		const result = Users.setOwnerByServiceAccountUsername(serviceAccountUsername, newOwner);
+		return result;
+	},
+});
diff --git a/app/ui-account/client/accountFlex.html b/app/ui-account/client/accountFlex.html
index 47b837332109..49ce53940650 100644
--- a/app/ui-account/client/accountFlex.html
+++ b/app/ui-account/client/accountFlex.html
@@ -29,6 +29,9 @@ <h1 class="sidebar-flex__title">{{_ "My_Account"}}</h1>
 				{{#if accessTokensEnabled}}
 					{{> sidebarItem menuItem "Personal_Access_Tokens" "key" "account" "tokens" }}
 				{{/if}}
+				{{#if serviceAccountTransferEnabled}}
+					{{> sidebarItem menuItem "Service_accounts" "user" "account" "ServiceAccounts" }}
+				{{/if}}
 			</ul>
 		</div>
 	</aside>
diff --git a/app/ui-account/client/accountFlex.js b/app/ui-account/client/accountFlex.js
index 0a47182934e7..2c440473c0d4 100644
--- a/app/ui-account/client/accountFlex.js
+++ b/app/ui-account/client/accountFlex.js
@@ -40,4 +40,7 @@ Template.accountFlex.helpers({
 	embeddedVersion() {
 		return Layout.isEmbedded();
 	},
+	serviceAccountTransferEnabled() {
+		return settings.get('Service_Accounts_TransferEnabled');
+	},
 });
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index fb8aed47a3da..9632d4238a63 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2707,6 +2707,9 @@
   "Service_account_name_placeholder": "Service Account name",
   "Service_account_username_placeholder": "Service Account username",
   "Service_account_title": "Create a new Service Account",
+  "Service_account_transfer": "Transfer Service Account",
+  "Service_account_transfer_description": "Enter the exact username of the user you want to transfer the Service Account",
+  "Service_account_transferred_successfully": "Service account transferred successfully",
   "set-leader": "Set Leader",
   "set-moderator": "Set Moderator",
   "set-moderator_description": "Permission to set other users as moderator of a channel",