diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 12859f6c..5d035f5b 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -172,10 +172,10 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
                 }
                 sessionid = getint(p);
                 int oldcn = player1->clientnum;
-                if(oldcn < 0 && mycn >= 0) sendintro();
-                player1->clientnum = mycn;      // we are now fully connected
-			    joining = getint(p);
+                player1->clientnum = mycn;
+                joining = getint(p);
                 if(getint(p) > 0) conoutf("INFO: this server is password protected");
+                if(oldcn < 0 && mycn >= 0) sendintro();
                 break;
             }
 
diff --git a/source/src/server.cpp b/source/src/server.cpp
index a337ba7e..cb6bf08a 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -3320,7 +3320,7 @@ void localconnect()
     c.type = ST_LOCAL;
     c.role = CR_ADMIN;
     s_strcpy(c.hostname, "local");
-    sendintro();
+    sendinits2c(c);
 }
 #endif