diff --git a/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
index 80169c5309..b69ad28a3d 100644
--- a/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
@@ -137,6 +137,7 @@ namespace OpenRA.Mods.RA.Server
 					{
 						client.Slot = null;
 						client.SpawnPoint = 0;
+						client.Color = HSLColor.FromRGB(255, 255, 255);
 						server.SyncLobbyInfo();
 						return true;
 					}},
@@ -530,8 +531,8 @@ namespace OpenRA.Mods.RA.Server
 						if (targetClient.Index != client.Index && !client.IsAdmin)
 							return true;
 
-						// Map has disabled color changes
-						if (targetClient.Slot != null && server.lobbyInfo.Slots[targetClient.Slot].LockColor)
+						// Spectator or map has disabled color changes
+						if (targetClient.Slot == null || server.lobbyInfo.Slots[targetClient.Slot].LockColor)
 							return true;
 
 						var ci = parts[1].Split(',').Select(cc => int.Parse(cc)).ToArray();
diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
index 3a7a9febba..199d0e6909 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -459,7 +459,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 						template = EditableSpectatorTemplate.Clone();
 
 					LobbyUtils.SetupEditableNameWidget(template, null, c, orderManager);
-					LobbyUtils.SetupEditableColorWidget(template, null, c, orderManager, colorPreview);
 				}
 				// Non-editable spectator
 				else
@@ -469,7 +468,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 
 					LobbyUtils.SetupNameWidget(template, null, client);
 					LobbyUtils.SetupKickWidget(template, null, client, orderManager);
-					LobbyUtils.SetupColorWidget(template, null, client);
 				}
 
 				LobbyUtils.SetupClientWidget(template, null, c, orderManager, true);
diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml
index 0410b00c54..cbf3380d14 100644
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -295,23 +295,11 @@ Container@SERVER_LOBBY:
 									Width:190
 									Height:25
 									MaxLength:16
-								DropDownButton@COLOR:
-									Width:70
-									Height:25
-									X:210
-									Font:Regular
-									IgnoreChildMouseOver: true
-									Children:
-										ColorBlock@COLORBLOCK:
-											X:5
-											Y:6
-											Width:PARENT_RIGHT-35
-											Height:PARENT_BOTTOM-12
 								Label@SPECTATOR:
 									Text:Spectator
-									Width:250
+									Width:315-55
 									Height:25
-									X:255
+									X:210
 									Y:0
 									Align:Center
 									Font:Bold
@@ -358,16 +346,11 @@ Container@SERVER_LOBBY:
 									X:180
 									Y:2
 									Font:Bold
-								ColorBlock@COLORBLOCK:
-									X:215
-									Y:6
-									Width:35
-									Height:13
 								Label@SPECTATOR:
 									Text:Spectator
-									Width:250
+									Width:315-55
 									Height:25
-									X:255
+									X:210
 									Y:0
 									Align:Center
 									Font:Bold
diff --git a/mods/d2k/chrome/lobby.yaml b/mods/d2k/chrome/lobby.yaml
index e9318f10ab..96f93f4682 100644
--- a/mods/d2k/chrome/lobby.yaml
+++ b/mods/d2k/chrome/lobby.yaml
@@ -273,22 +273,11 @@ Background@SERVER_LOBBY:
 							Width:135
 							Height:25
 							MaxLength:16
-						DropDownButton@COLOR:
-							Width:80
-							Height:25
-							X:160
-							Font:Regular
-							Children:
-								ColorBlock@COLORBLOCK:
-									X:5
-									Y:6
-									Width:PARENT_RIGHT-35
-									Height:PARENT_BOTTOM-12
 						Label@SPECTATOR:
 							Text:Spectator
-							Width:225
+							Width:278
 							Height:25
-							X:245
+							X:160
 							Y:0
 							Align:Center
 							Font:Bold
@@ -334,16 +323,11 @@ Background@SERVER_LOBBY:
 							X:125
 							Y:2
 							Font:Bold
-						ColorBlock@COLORBLOCK:
-							X:165
-							Y:6
-							Width:45
-							Height:13
 						Label@SPECTATOR:
 							Text:Spectator
-							Width:225
+							Width:278
 							Height:25
-							X:245
+							X:160
 							Y:0
 							Align:Center
 							Font:Bold
diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml
index 3cc144e14a..5a2c39ddfc 100644
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -273,22 +273,11 @@ Background@SERVER_LOBBY:
 							Width:135
 							Height:25
 							MaxLength:16
-						DropDownButton@COLOR:
-							Width:80
-							Height:25
-							X:160
-							Font:Regular
-							Children:
-								ColorBlock@COLORBLOCK:
-									X:5
-									Y:6
-									Width:PARENT_RIGHT-35
-									Height:PARENT_BOTTOM-12
 						Label@SPECTATOR:
 							Text:Spectator
-							Width:225
+							Width:278
 							Height:25
-							X:245
+							X:160
 							Y:0
 							Align:Center
 							Font:Bold
@@ -334,16 +323,11 @@ Background@SERVER_LOBBY:
 							X:125
 							Y:2
 							Font:Bold
-						ColorBlock@COLORBLOCK:
-							X:165
-							Y:6
-							Width:45
-							Height:13
 						Label@SPECTATOR:
 							Text:Spectator
-							Width:225
+							Width:278
 							Height:25
-							X:245
+							X:160
 							Y:0
 							Align:Center
 							Font:Bold