diff --git a/package-lock.json b/package-lock.json
index 4929d0b1b58b..97179fe78504 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1726,7 +1726,7 @@
 		"bcrypt": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
-			"integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
+			"integrity": "sha1-sC3cbAtS6ha40883XVoy54DatUg=",
 			"requires": {
 				"nan": "2.6.2",
 				"node-pre-gyp": "0.6.36"
@@ -5493,7 +5493,7 @@
 		"glob": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+			"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
 			"requires": {
 				"fs.realpath": "1.0.0",
 				"inflight": "1.0.6",
@@ -8379,7 +8379,7 @@
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
 			"requires": {
 				"brace-expansion": "1.1.11"
 			}
@@ -8758,7 +8758,7 @@
 		"npmlog": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
 			"requires": {
 				"are-we-there-yet": "1.1.4",
 				"console-control-strings": "1.1.0",
@@ -13201,7 +13201,7 @@
 		"wide-align": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-			"integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+			"integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
 			"requires": {
 				"string-width": "1.0.2"
 			}
diff --git a/packages/rocketchat-lib/server/functions/setUsername.js b/packages/rocketchat-lib/server/functions/setUsername.js
index 96b57d1a7c8e..5d346bad6c28 100644
--- a/packages/rocketchat-lib/server/functions/setUsername.js
+++ b/packages/rocketchat-lib/server/functions/setUsername.js
@@ -66,6 +66,7 @@ RocketChat._setUsername = function(userId, u) {
 		RocketChat.models.Rooms.replaceUsernameOfUserByUserId(user._id, username);
 		RocketChat.models.Subscriptions.setUserUsernameByUserId(user._id, username);
 		RocketChat.models.Subscriptions.setNameForDirectRoomsWithOldName(previousUsername, username);
+		RocketChat.models.LivechatDepartmentAgents.replaceUsernameOfAgentByUserId(user._id, username);
 
 		const fileStore = FileUpload.getStore('Avatars');
 		const file = fileStore.model.findOneByName(previousUsername);
diff --git a/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js b/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js
index 7215f516eeb4..7d2e9e86ad85 100644
--- a/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js
+++ b/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js
@@ -118,6 +118,18 @@ class LivechatDepartmentAgents extends RocketChat.models._Base {
 
 		return this.find(query, options);
 	}
+
+	replaceUsernameOfAgentByUserId(userId, username) {
+		const query = {'agentId': userId};
+
+		const update = {
+			$set: {
+				username
+			}
+		};
+
+		return this.update(query, update, { multi: true });
+	}
 }
 
 RocketChat.models.LivechatDepartmentAgents = new LivechatDepartmentAgents();