diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 533b6e9e4f717..0699148fe3b42 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -22,6 +22,7 @@
   "Accounts_AllowedDomainsList_Description": "Comma-separated list of allowed domains",
   "Accounts_AllowEmailChange": "Allow Email Change",
   "Accounts_AllowPasswordChange": "Allow Password Change",
+  "Accounts_AllowSearchByName": "Allow user search by name",
   "Accounts_AllowUserAvatarChange": "Allow User Avatar Change",
   "Accounts_AllowUsernameChange": "Allow Username Change",
   "Accounts_AllowUserProfileChange": "Allow User Profile Change",
diff --git a/packages/rocketchat-lib/server/startup/settings.coffee b/packages/rocketchat-lib/server/startup/settings.coffee
index 38252be402587..0fe637a398c4e 100644
--- a/packages/rocketchat-lib/server/startup/settings.coffee
+++ b/packages/rocketchat-lib/server/startup/settings.coffee
@@ -14,6 +14,7 @@ RocketChat.settings.addGroup 'Accounts', ->
 	@add 'Accounts_ShowFormLogin', true, { type: 'boolean', public: true }
 	@add 'Accounts_EmailOrUsernamePlaceholder', '', { type: 'string', public: true, i18nLabel: 'Placeholder_for_email_or_username_login_field' }
 	@add 'Accounts_PasswordPlaceholder', '', { type: 'string', public: true, i18nLabel: 'Placeholder_for_password_login_field' }
+	@add 'Accounts_AllowSearchByName', false, { type: 'boolean', public: true }
 
 	@section 'Registration', ->
 		@add 'Accounts_RequireNameForSignUp', true, { type: 'boolean', public: true }
diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index 3a3d5c706cc5a..99b1a5a494d20 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -577,6 +577,10 @@ textarea[disabled] {
 	padding: 8px 5px;
 	font-size: 12px;
 	cursor: pointer;
+	font-weight: 300;
+	strong {
+		font-weight: normal;
+	}
 }
 
 label.required:after {
@@ -2285,6 +2289,10 @@ label.required:after {
 	line-height: 32px;
 	cursor: pointer;
 	user-select: none;
+	font-weight: 300;
+	strong {
+		font-weight: normal;
+	}
 }
 
 .popup-user-avatar {
diff --git a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
index d067c29d90d46..1670c52e29ea0 100755
--- a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
+++ b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
@@ -167,6 +167,12 @@ input.search {
 	&.selected {
 		background-color: @tertiary-background-color;
 		color: @primary-font-color;
+		strong {
+			color: @primary-font-color;
+		}
+	}
+	strong {
+		color: @primary-font-color;
 	}
 }
 
@@ -755,6 +761,12 @@ a.github-fork {
 	&.selected {
 		background-color: #4CAEEB;
 		color: #FFF;
+		strong {
+			color: #FFF;
+		}
+	}
+	strong {
+		color: @primary-font-color;
 	}
 }
 
diff --git a/packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee b/packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee
index 7b0256bd0d517..169a9e0e5d9c5 100644
--- a/packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee
+++ b/packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee
@@ -31,6 +31,7 @@ getUsersFromServer = (filter, records, cb) =>
 						_id: result.username
 						username: result.username
 						status: 'offline'
+						name: result.name
 						sort: 3
 
 			records = _.sortBy(records, 'sort')
@@ -80,6 +81,7 @@ Template.messagePopupConfig.helpers
 							_id: item.username
 							username: item.username
 							status: item.status
+							name: item.name
 							sort: 1
 
 				# Get users of room
diff --git a/packages/rocketchat-ui/views/app/spotlight/spotlight.coffee b/packages/rocketchat-ui/views/app/spotlight/spotlight.coffee
index 59acdec340a48..26dd4b0ee1bff 100644
--- a/packages/rocketchat-ui/views/app/spotlight/spotlight.coffee
+++ b/packages/rocketchat-ui/views/app/spotlight/spotlight.coffee
@@ -19,7 +19,8 @@ getFromServer = (filter, records, cb) =>
 				server.push({
 					_id: user._id
 					t: 'd',
-					name: user.username
+					name: user.username,
+					fullName: user.name
 				})
 
 		if results?.rooms?.length > 0
diff --git a/packages/rocketchat-ui/views/app/spotlight/spotlightTemplate.html b/packages/rocketchat-ui/views/app/spotlight/spotlightTemplate.html
index c0860daa368b3..0bbae76f57ff7 100644
--- a/packages/rocketchat-ui/views/app/spotlight/spotlightTemplate.html
+++ b/packages/rocketchat-ui/views/app/spotlight/spotlightTemplate.html
@@ -1,6 +1,6 @@
 <template name="spotlightTemplate">
 	<i class="{{icon}} {{userStatus}}"></i>
-	{{name}}
+	<strong>{{name}}</strong> {{fullName}}
 	{{#if unread}}
 		<span>{{unread}}</span>
 	{{/if}}
diff --git a/packages/rocketchat-ui/views/app/userSearch.html b/packages/rocketchat-ui/views/app/userSearch.html
index 180a40b673b7a..d24af6daefe57 100644
--- a/packages/rocketchat-ui/views/app/userSearch.html
+++ b/packages/rocketchat-ui/views/app/userSearch.html
@@ -1,5 +1,5 @@
 <template name="userSearch">
-	<i class="icon-at status-{{status}}"></i> {{username}}{{#if name}} - <strong>{{name}}</strong>{{/if}}
+	<i class="icon-at status-{{status}}"></i> <strong>{{username}}</strong> {{name}}
 </template>
 <template name="userSearchEmpty">
 	<p>{{_ "Nothing_found"}}.</p>
diff --git a/server/publications/spotlight.coffee b/server/publications/spotlight.coffee
index 9981a6dd5a6a4..f6a547b0c3ed2 100644
--- a/server/publications/spotlight.coffee
+++ b/server/publications/spotlight.coffee
@@ -10,7 +10,10 @@ Meteor.methods
 		regex = new RegExp s.trim(s.escapeRegExp(text)), "i"
 
 		if type.users is true and RocketChat.authz.hasPermission this.userId, 'view-d-room'
-			result.users = RocketChat.models.Users.findByActiveUsersUsernameExcept(text, usernames, { limit: 5, fields: { username: 1, status: 1 }, sort: { username: 1 } }).fetch()
+			if RocketChat.settings.get('Accounts_AllowSearchByName')
+				result.users = RocketChat.models.Users.findActiveByUsernameOrNameRegexWithExceptions(text, usernames, { limit: 5, fields: { username: 1, status: 1, name: 1 }, sort: { username: 1 } }).fetch()
+			else
+				result.users = RocketChat.models.Users.findByActiveUsersUsernameExcept(text, usernames, { limit: 5, fields: { username: 1, status: 1 }, sort: { username: 1 } }).fetch()
 
 		if type.rooms is true and RocketChat.authz.hasPermission this.userId, 'view-c-room'
 			username = RocketChat.models.Users.findOneById(this.userId, { username: 1 }).username
diff --git a/server/publications/userAutocomplete.coffee b/server/publications/userAutocomplete.coffee
index aea30cd8cc46e..7c2f44310504b 100644
--- a/server/publications/userAutocomplete.coffee
+++ b/server/publications/userAutocomplete.coffee
@@ -7,7 +7,6 @@ Meteor.publish 'userAutocomplete', (selector) ->
 
 	options =
 		fields:
-			name: 1
 			username: 1
 			status: 1
 		sort:
@@ -18,7 +17,13 @@ Meteor.publish 'userAutocomplete', (selector) ->
 
 	exceptions = selector.exceptions or []
 
-	cursorHandle = RocketChat.models.Users.findActiveByUsernameOrNameRegexWithExceptions(selector.term, exceptions, options).observeChanges
+	if RocketChat.settings.get('Accounts_AllowSearchByName')
+		options.fields.name = 1
+		find = RocketChat.models.Users.findActiveByUsernameOrNameRegexWithExceptions(selector.term, exceptions, options)
+	else
+		find = RocketChat.models.Users.findByActiveUsersUsernameExcept(selector.term, exceptions, options)
+
+	cursorHandle = find.observeChanges
 		added: (_id, record) ->
 			pub.added("autocompleteRecords", _id, record)