Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientConnection.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientConnection.js
+++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientConnection.js
@@ -18,9 +18,10 @@
 
 	onClientLeave(guid)
 	{
-		this.args.username = g_PlayerAssignments[guid].name;
+		this.args.username = global.colorizePlayernameByGUID(guid);
 		this.chatMessagesPanel.addStatusMessage(sprintf(this.LeaveText, this.args));
 	}
+
 };
 
 ChatMessageEvents.ClientConnection.prototype.JoinText =
Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientReady.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientReady.js
+++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientReady.js
@@ -19,7 +19,7 @@
 		if (!text)
 			return;
 
-		this.args.username = playerAssignment.name;
+		this.args.username = global.colorizePlayernameByGUID(message.guid);
 		this.chatMessagesPanel.addText(sprintf(text, this.args));
 	}
 };