diff --git a/Output/PartyModes/Challenge/Code/PartyScreenChallengeNames.cs b/Output/PartyModes/Challenge/Code/PartyScreenChallengeNames.cs
index 151ed406..4db6c955 100644
--- a/Output/PartyModes/Challenge/Code/PartyScreenChallengeNames.cs
+++ b/Output/PartyModes/Challenge/Code/PartyScreenChallengeNames.cs
@@ -283,7 +283,7 @@ namespace Vocaluxe.PartyModes
 
             for (int i = 0; i < PlayerDestinationButtons.Count; i++)
             {
-                PlayerDestinationButtons[i].Text.Text = "Player " + i;
+                PlayerDestinationButtons[i].Text.Text = "Player " + (i+1);
                 if (i <= NumPlayers)
                     PlayerDestinationButtons[i].Visible = true;
                 else
@@ -291,6 +291,7 @@ namespace Vocaluxe.PartyModes
             }
 
             UpdateButtonPlayerChoose();
+            UpdateButtonPlayerDestination();
 
             UpdateButtonNext();
         }
@@ -336,6 +337,17 @@ namespace Vocaluxe.PartyModes
             }
         }
 
+        private void UpdateButtonPlayerDestination()
+        {
+            for (int i = 0; i < PlayerDestinationButtons.Count; i++)
+            {
+                if(NumPlayers > i)
+                    PlayerDestinationButtons[i].Visible = true;
+                else
+                    PlayerDestinationButtons[i].Visible = false;
+            }
+        }
+
         private void UpdateButtonNext()
         {
             Buttons[htButtons(ButtonNext)].Visible = true;
diff --git a/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModeChallenge/PartyScreenChallengeNames.cs
index 151ed406..4db6c955 100644
--- a/PartyModeChallenge/PartyScreenChallengeNames.cs
+++ b/PartyModeChallenge/PartyScreenChallengeNames.cs
@@ -283,7 +283,7 @@ namespace Vocaluxe.PartyModes
 
             for (int i = 0; i < PlayerDestinationButtons.Count; i++)
             {
-                PlayerDestinationButtons[i].Text.Text = "Player " + i;
+                PlayerDestinationButtons[i].Text.Text = "Player " + (i+1);
                 if (i <= NumPlayers)
                     PlayerDestinationButtons[i].Visible = true;
                 else
@@ -291,6 +291,7 @@ namespace Vocaluxe.PartyModes
             }
 
             UpdateButtonPlayerChoose();
+            UpdateButtonPlayerDestination();
 
             UpdateButtonNext();
         }
@@ -336,6 +337,17 @@ namespace Vocaluxe.PartyModes
             }
         }
 
+        private void UpdateButtonPlayerDestination()
+        {
+            for (int i = 0; i < PlayerDestinationButtons.Count; i++)
+            {
+                if(NumPlayers > i)
+                    PlayerDestinationButtons[i].Visible = true;
+                else
+                    PlayerDestinationButtons[i].Visible = false;
+            }
+        }
+
         private void UpdateButtonNext()
         {
             Buttons[htButtons(ButtonNext)].Visible = true;