diff --git a/src/packets.c b/src/packets.c
index ffdea78..9a21b78 100644
--- a/src/packets.c
+++ b/src/packets.c
@@ -100,7 +100,7 @@ do_joingame (struct pkg_joingame *p_jg, _net_addr * addr) {
 	}		
 	
     /* find a free place for the player and add the player to the game*/
-    if ((addr->pl_nr == -1) && GS_WAITRUNNING && GT_MP_PTPM) {
+    if (GS_WAITRUNNING && GT_MP_PTPM) {
         /* find free player slot */
         if (addr->pl_nr == -1)
             for (i = 0; (i < MAX_PLAYERS && PS_IS_used (players[i].state)); i++);
@@ -138,8 +138,8 @@ do_joingame (struct pkg_joingame *p_jg, _net_addr * addr) {
             bman.players_nr_s++;
 
             /* send to the new client the servermode and the complete playerlist */
-            send_servermode (addr, i);
             send_mapinfo (addr);
+            send_servermode (addr, i);
 
 			addr->pl_nr = i;