diff --git a/Server/Client.cs b/Server/Client.cs
index 521e2e4..2ef9012 100644
--- a/Server/Client.cs
+++ b/Server/Client.cs
@@ -23,7 +23,7 @@ public class Client : IDisposable {
 
     public Client(Socket socket) {
         Socket = socket;
-        Logger = new Logger(socket.RemoteEndPoint?.ToString() ?? "Unknown User???");
+        Logger = new Logger("Unknown User");
     }
 
     public void Dispose() {
diff --git a/Server/Server.cs b/Server/Server.cs
index 3785f18..d3efbcd 100644
--- a/Server/Server.cs
+++ b/Server/Server.cs
@@ -146,6 +146,7 @@ public class Server {
                     ConnectPacket connect = new ConnectPacket();
                     connect.Deserialize(memory.Memory.Span[Constants.HeaderSize..Constants.MaxPacketSize]);
                     lock (Clients) {
+                        client.Name = connect.ClientName;
                         bool firstConn = false;
                         switch (connect.ConnectionType) {
                             case ConnectionTypes.FirstConnection: {
@@ -154,7 +155,6 @@ public class Server {
                             }
                             case ConnectionTypes.Reconnecting: {
                                 client.Id = header.Id;
-                                client.Name = connect.ClientName;
                                 if (FindExistingClient(header.Id) is { } newClient) {
                                     if (newClient.Connected) throw new Exception($"Tried to join as already connected user {header.Id}");
                                     newClient.Socket = client.Socket;