diff --git a/source/src/client.cpp b/source/src/client.cpp
index b604591b..b7324cf1 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -278,16 +278,16 @@ void c2sinfo(playerent *d)                  // send update to the server
         packet = enet_packet_create (NULL, MAXTRANS, 0);
         ucharbuf p(packet->data, packet->dataLength);
     
-        if(clientpassword[0])
-        {
-            putint(p, SV_PWD);
-            sendstring(clientpassword, p);
-            clientpassword[0] = 0;
-        }
         if(!c2sinit)    // tell other clients who I am
         {
             packet->flags = ENET_PACKET_FLAG_RELIABLE;
             c2sinit = true;
+            if(clientpassword[0])
+            {
+                putint(p, SV_PWD);
+                sendstring(clientpassword, p);
+                clientpassword[0] = 0;
+            }
             putint(p, SV_INITC2S);
             sendstring(player1->name, p);
             sendstring(player1->team, p);