diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
index 5d76b077..db882cd4 100644
--- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
+++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
@@ -210,7 +210,7 @@ namespace VocaluxeLib.PartyModes.Challenge
                     _Stage = EStage.Config;
                     break;
                 case EStage.Main:
-                    _Stage = EStage.Config;
+                    _Stage = EStage.Names;
                     break;
                 default: // Rest is not allowed
                     throw new ArgumentException("Invalid stage: " + _Stage);
diff --git a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
index 78dacac6..ec9429f9 100644
--- a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
+++ b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
@@ -217,7 +217,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
                     _Stage = EStage.Config;
                     break;
                 case EStage.Main:
-                    _Stage = EStage.Config;
+                    _Stage = EStage.Names;
                     break;
                 default: // Rest is not allowed
                     throw new ArgumentException("Invalid stage: " + _Stage);
diff --git a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
index a5fe3c28..698c5a99 100644
--- a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
+++ b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
@@ -117,6 +117,7 @@ namespace VocaluxeLib.Menu
         {
             _TeamList = teamProfiles;
             _UpdateSlides();
+            _UpdateNextButtonVisibility();
         }
 
         public override bool HandleInput(SKeyEvent keyEvent)