diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/player/PlayerUtils.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/player/PlayerUtils.java
index c6599bb..820ad34 100644
--- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/player/PlayerUtils.java
+++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/player/PlayerUtils.java
@@ -38,22 +38,19 @@ public class PlayerUtils {
 
 
     public static void createPlayer(UUID uuid, UnifiedJedis unifiedJedis, String currentServer, InetAddress hostname, boolean fireEvent) {
-        if (currentServer != null) {
-            unifiedJedis.hset("player:" + uuid, "server", currentServer);
-        }
         final boolean isKickedFromOtherLocation = isKickedOtherLocation(uuid.toString(), unifiedJedis);
         Map<String, String> playerData = new HashMap<>(4);
         playerData.put("online", "0");
         playerData.put("ip", hostname.getHostName());
         playerData.put("proxy", AbstractRedisBungeeAPI.getAbstractRedisBungeeAPI().getProxyId());
-
+        if (currentServer != null) {
+            playerData.put("server", currentServer);
+        }
         unifiedJedis.sadd("proxy:" + AbstractRedisBungeeAPI.getAbstractRedisBungeeAPI().getProxyId() + ":usersOnline", uuid.toString());
         unifiedJedis.hset("player:" + uuid, playerData);
-
         if (fireEvent && !isKickedFromOtherLocation) {
             playerJoinPayload(uuid, unifiedJedis, hostname);
         }
-
     }