diff --git a/Server/Server.cs b/Server/Server.cs
index dfe19cd..f312ea3 100644
--- a/Server/Server.cs
+++ b/Server/Server.cs
@@ -170,7 +170,6 @@ public class Server {
                     ConnectPacket connect = new ConnectPacket();
                     connect.Deserialize(memory.Memory.Span[packetRange]);
                     lock (Clients) {
-                        client.Name = connect.ClientName;
                         if (Clients.Count(x => x.Connected) == Settings.Instance.Server.MaxPlayers) {
                             client.Logger.Error($"Turned away as server is at max clients");
                             memory.Dispose();
@@ -212,6 +211,7 @@ public class Server {
                                 throw new Exception($"Invalid connection type {connect.ConnectionType}");
                         }
 
+                        client.Name = connect.ClientName;
                         client.Connected = true;
                         if (firstConn) {
                             // do any cleanup required when it comes to new clients
@@ -313,4 +313,4 @@ public class Server {
         header.Deserialize(data[..Constants.HeaderSize]);
         return header;
     }
-}
\ No newline at end of file
+}