diff --git a/src/multiwait.c b/src/multiwait.c
index c9084c6..248df10 100644
--- a/src/multiwait.c
+++ b/src/multiwait.c
@@ -104,10 +104,13 @@ mw_draw_status ()
 
         sprintf (text, " %10s %2d %2d", bman.players[pnr].name, bman.players[pnr].wins,
                  bman.players[pnr].points);
-        if (bman.lastwinner == pnr)
-            draw_text (x + x1 * 320, y, text, 1);
-        else
-            draw_text (x + x1 * 320, y, text, 0);
+        if (PS_IS_used (bman.players[pnr].state)) {
+
+            if (bman.lastwinner == pnr)
+                draw_text (x + x1 * 320, y, text, 1);
+            else
+                draw_text (x + x1 * 320, y, text, 0);
+        }
         x1++;
         if (x1 >= px) {
             y += 32;
@@ -254,19 +257,19 @@ wait_for_players ()
             ready = 0;
 
         /* draw the screeninformations */
-        if (bman.p_nr == -1) {   /* we have no connect yet */
+        if (bman.p_nr == -1) {  /* we have no connect yet */
             mw_wait_for_connect ();
-			SDL_Flip (gfx.screen);
-		}
+            SDL_Flip (gfx.screen);
+        }
         else {                  /* we have a connect so draw status */
             mw_draw_status ();
             mw_draw_gfxselect (selgfx);
-			gfx_AddUpdateRect (0 ,0 ,gfx.res.x , mw_y);
+            gfx_AddUpdateRect (0, 0, gfx.res.x, mw_y);
             mw_draw_chat ();
         }
 
-		gfx_UpdateRects ();
-		
+        gfx_UpdateRects ();
+
         /* do the keyboard handling */
         if (SDL_PollEvent (&event) != 0)
             switch (event.type) {
@@ -350,8 +353,8 @@ wait_for_players ()
             keypressed = 1;
 
         /* calculate time sync. */
-		s_delay (50);
-	}
+        s_delay (50);
+    }
 
     mw_shutdown ();
 };