Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientConnection.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientConnection.js	(revision 23580)
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientConnection.js	(revision 23581)
@@ -1,30 +1,30 @@
 ChatMessageEvents.ClientConnection = class
 {
 	constructor(setupWindow, chatMessagesPanel)
 	{
 		this.chatMessagesPanel = chatMessagesPanel;
 
 		setupWindow.controls.playerAssignmentsControl.registerClientJoinHandler(this.onClientJoin.bind(this));
 		setupWindow.controls.playerAssignmentsControl.registerClientLeaveHandler(this.onClientLeave.bind(this));
 
 		this.args = {};
 	}
 
 	onClientJoin(newGUID, newAssignments)
 	{
 		this.args.username = newAssignments[newGUID].name;
 		this.chatMessagesPanel.addStatusMessage(sprintf(this.JoinText, this.args));
 	}
 
 	onClientLeave(guid)
 	{
-		this.args.username = g_PlayerAssignments[guid].name;
+		this.args.username = colorizePlayernameByGUID(guid);
 		this.chatMessagesPanel.addStatusMessage(sprintf(this.LeaveText, this.args));
 	}
 };
 
 ChatMessageEvents.ClientConnection.prototype.JoinText =
 	translate("%(username)s has joined");
 
 ChatMessageEvents.ClientConnection.prototype.LeaveText =
 	translate("%(username)s has left");
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientReady.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientReady.js	(revision 23580)
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessages/ClientReady.js	(revision 23581)
@@ -1,30 +1,34 @@
 ChatMessageEvents.ClientReady = class
 {
 	constructor(setupWindow, chatMessagesPanel)
 	{
 		this.chatMessagesPanel = chatMessagesPanel;
 
 		this.args = {};
 
 		setupWindow.controls.netMessages.registerNetMessageHandler("ready", this.onReadyMessage.bind(this));
 	}
 
 	onReadyMessage(message)
 	{
 		let playerAssignment = g_PlayerAssignments[message.guid];
 		if (!playerAssignment || playerAssignment.player == -1)
 			return;
 
 		let text = this.ReadyMessage[message.status] || undefined;
 		if (!text)
 			return;
 
-		this.args.username = playerAssignment.name;
-		this.chatMessagesPanel.addText(sprintf(text, this.args));
+		this.args.username = colorizePlayernameByGUID(message.guid);
+		this.chatMessagesPanel.addText(setStringTags(sprintf(text, this.args), this.MessageTags));
 	}
 };
 
 ChatMessageEvents.ClientReady.prototype.ReadyMessage = [
 	translate("* %(username)s is not ready."),
 	translate("* %(username)s is ready!")
 ];
+
+ChatMessageEvents.ClientReady.prototype.MessageTags = {
+	"font": "sans-bold-13"
+};