diff --git a/include/server/events.nut b/include/server/events.nut
index 3498dfd..fb9f66e 100644
--- a/include/server/events.nut
+++ b/include/server/events.nut
@@ -450,17 +450,9 @@ addEventHandler("onPlayerEquipSpell", function(playerid, slotId, instance)
 
 addEventHandler("onPlayerJoin", function(playerid)
 {
-    local client_password = _globalInstance.generateClientPassword();
-
-    local packet = Packet();
-    packet.writeUInt8(250);
-    packet.writeString(client_password);
-    packet.send(playerid, RELIABLE);
-
     local data = {
         event = "onPlayerJoin",
-        playerid = playerid,
-        password = client_password
+        playerid = playerid
     }
 
     if (_globalInstance != -1)
diff --git a/include/server/main.nut b/include/server/main.nut
index 4d7fa35..7c1ed20 100644
--- a/include/server/main.nut
+++ b/include/server/main.nut
@@ -95,9 +95,14 @@ class PyG2O
 }
 
 addEventHandler("onPlayerJoin", function(playerid){
-    new_token = _globalInstance.generateClientPassword();
+    local new_token = _globalInstance.generateClientPassword();
     _globalInstance.send({"create_temp_token": new_token})
     _clientTokens[playerid] = new_token;
+
+    local packet = Packet();
+    packet.writeUInt8(250);
+    packet.writeString(new_token);
+    packet.send(playerid, RELIABLE);
 });
 
 addEventHandler("onPlayerDisconnect", function(playerid, reason){