diff --git a/js/client-chat.js b/js/client-chat.js
index 047bba230..21e4cdcf1 100644
--- a/js/client-chat.js
+++ b/js/client-chat.js
@@ -315,7 +315,11 @@
 			var substituteUserId = candidate[0];
 			if (!users[substituteUserId]) return true;
 			var name = users[substituteUserId].substr(1);
-			name = name.replace(/[^A-Za-z0-9]+$/, '');
+			var shortName = name.replace(/[^A-Za-z0-9]+$/, '');
+			if (shortName.indexOf('(') >= 0) {
+				shortName += name.slice(shortName.length).replace(/[^\(\)]+/g, '').replace(/\(\)/g, '');
+			}
+			name = shortName;
 			var fullPrefix = this.tabComplete.prefix.substr(0, candidate[1]) + name;
 			$textbox.val(fullPrefix + text.substr(idx));
 			var pos = fullPrefix.length;