diff --git a/gameserver/src/main/java/brainwine/gameserver/entity/player/Player.java b/gameserver/src/main/java/brainwine/gameserver/entity/player/Player.java
index 7368dc4..fe57c45 100644
--- a/gameserver/src/main/java/brainwine/gameserver/entity/player/Player.java
+++ b/gameserver/src/main/java/brainwine/gameserver/entity/player/Player.java
@@ -256,6 +256,7 @@ public class Player extends Entity implements CommandExecutor {
     public void onDisconnect() {
         lastHeartbeat = 0;
         lastPlacement = null;
+        clientVersion = null;
         
         if(zone != null) {
             zone.removePlayer(this);
diff --git a/gameserver/src/main/java/brainwine/gameserver/entity/player/PlayerManager.java b/gameserver/src/main/java/brainwine/gameserver/entity/player/PlayerManager.java
index 7971364..f7679c0 100644
--- a/gameserver/src/main/java/brainwine/gameserver/entity/player/PlayerManager.java
+++ b/gameserver/src/main/java/brainwine/gameserver/entity/player/PlayerManager.java
@@ -150,8 +150,8 @@ public class PlayerManager {
             return;
         }
         
-        player.setClientVersion(version);
         player.setConnection(connection);
+        player.setClientVersion(version);
         playersByConnection.put(connection, player);
         Zone zone = player.getZone();