diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 3cf632a1d0..ee814d6be8 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -524,8 +524,8 @@ define('forum/chats', [
 			$('[data-roomid="' + ajaxify.data.roomId + '"]').toggleClass('unread', false);
 			$('.expanded-chat [component="chat/input"]').focus();
 		}
-		$('.chats-list li').removeClass('bg-info');
-		$('.chats-list li[data-roomid="' + ajaxify.data.roomId + '"]').addClass('bg-info');
+		$('.chats-list li').removeClass('active');
+		$('.chats-list li[data-roomid="' + ajaxify.data.roomId + '"]').addClass('active');
 
 		components.get('chat/nav-wrapper').attr('data-loaded', ajaxify.data.roomId ? '1' : '0');
 	};
diff --git a/src/messaging/index.js b/src/messaging/index.js
index f6a0f71e6b..0b7d04eae5 100644
--- a/src/messaging/index.js
+++ b/src/messaging/index.js
@@ -141,7 +141,7 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
 Messaging.generateUsernames = function (users, excludeUid) {
 	users = users.filter(u => u && parseInt(u.uid, 10) !== excludeUid);
 	const usernames = users.map(u => u.username);
-	if (users.length > 2) {
+	if (users.length > 3) {
 		return translator.compile(
 			'modules:chat.usernames-and-x-others',
 			usernames.slice(0, 2).join(', '),