diff --git a/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModeChallenge/PartyScreenChallengeMain.cs
index a4fab9f5..f063b5a3 100644
--- a/PartyModeChallenge/PartyScreenChallengeMain.cs
+++ b/PartyModeChallenge/PartyScreenChallengeMain.cs
@@ -355,10 +355,10 @@ namespace Vocaluxe.PartyModes
 
             for (int i = 0; i < Table.Count; i++)
             {
+                TableRow row = Table[i];
+
                 if (i < GameState.ResultTable.Count)
                 {
-                    TableRow row = Table[i];
-
                     row.Pos.Visible = true;
                     row.Name.Visible = true;
                     row.Rounds.Visible = true;
@@ -372,6 +372,15 @@ namespace Vocaluxe.PartyModes
                     row.SingPoints.Text = GameState.ResultTable[i].SumSingPoints.ToString();
                     row.GamePoints.Text = GameState.ResultTable[i].NumGamePoints.ToString();
                 }
+                else
+                {
+                    row.Pos.Visible = false;
+                    row.Name.Visible = false;
+                    row.Rounds.Visible = false;
+                    row.Won.Visible = false;
+                    row.SingPoints.Visible = false;
+                    row.GamePoints.Visible = false;
+                }
             }
         }
     }
diff --git a/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModeChallenge/PartyScreenChallengeNames.cs
index 6603f766..4532e91a 100644
--- a/PartyModeChallenge/PartyScreenChallengeNames.cs
+++ b/PartyModeChallenge/PartyScreenChallengeNames.cs
@@ -402,8 +402,8 @@ namespace Vocaluxe.PartyModes
 
                     for (int p = 0; p < Data.ScreenNames.ProfileIDs.Count; p++)
                     {
-                        //Don't show profile if is selected, but if selected and guest
-                        if (Data.ScreenNames.ProfileIDs[p] == i && _Base.Profiles.GetProfiles()[i].GuestProfile == EOffOn.TR_CONFIG_OFF)
+                        //Don't show profile if is selected
+                        if (Data.ScreenNames.ProfileIDs[p] == i)
                         {
                             visible = false;
                             break;