diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs
index da74477f6c..35b0cb2ae3 100644
--- a/OpenRA.Game/Network/UnitOrders.cs
+++ b/OpenRA.Game/Network/UnitOrders.cs
@@ -45,7 +45,7 @@ namespace OpenRA.Network
 							var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
 							suffix = client.IsObserver ? " (Spectator)" : suffix;
 
-							if (orderManager.LocalClient != null && client != orderManager.LocalClient && client.Team == orderManager.LocalClient.Team)
+							if (orderManager.LocalClient != null && client != orderManager.LocalClient && client.Team > 0 && client.Team == orderManager.LocalClient.Team)
 								suffix += " (Ally)";
 
 							Game.AddChatLine(client.Color.RGB, client.Name + suffix, order.TargetString);
diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs
index 3586c548d9..a18dc9d68a 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ServerBrowserLogic.cs
@@ -336,22 +336,25 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 			if (game.State == (int)ServerState.GameStarted)
 			{
+				var label = "";
 				try
 				{
 					var runTime = DateTime.Now - System.DateTime.Parse(game.Started);
-					return "In progress for {0} minute{1}".F(runTime.Minutes, runTime.Minutes > 1 ? "s" : "");
+					label = "In progress for {0} minute{1}".F(runTime.Minutes, runTime.Minutes > 1 ? "s" : "");
 				}
 				catch (Exception)
 				{
-					return "In progress";
+					label = "In progress";
 				}
+
+				return game.Protected ? label + " (Password protected)" : label;
 			}
 
-			if (game.Protected)
-				return "Password protected";
-
 			if (game.State == (int)ServerState.WaitingPlayers)
-				return "Waiting for players";
+			{
+				var label = "Waiting for players";
+				return game.Protected ? label + " (Password protected)" : label;
+			}
 
 			if (game.State == (int)ServerState.ShuttingDown)
 				return "Server shutting down";