diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index 0506016b13..09ce88a099 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -197,7 +197,12 @@
 	<object name="chatDialogPanel" size="50%-180 50%-48 50%+180 50%+36" type="image" hidden="true" sprite="genericPanel">
 		<object name="chatInput" size="16 12 100%-16 36" type="input" style="ModernInput" max_length="80">
 			<action on="Press">submitChatInput();</action>
-			<action on="Tab">autoCompleteNick("chatInput", g_Players);</action>
+			<action on="Tab">
+				var players = [];
+				for (var player in g_PlayerAssignments)
+					players.push(g_PlayerAssignments[player]);
+				autoCompleteNick("chatInput", players);
+			</action>
 		</object>
 
 		<object size="16 100%-40 30%+16 100%-12" type="button" style="StoneButton">