diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
index f5663fb6ba..7aa4f6b193 100644
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -270,6 +270,11 @@ namespace OpenRA.Server
 							SendChatTo( conn, "Blank names are not permitted." );
 							return true;
 						}
+						
+						if (s.Length > 10)
+						{
+							s = s.Substring(0,10);
+						}
 
 						Console.WriteLine("Player@{0} is now known as {1}", conn.socket.RemoteEndPoint, s);
 						GetClient(conn).Name = s;