diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index d1ebaf4930..a5f56e0123 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -723,7 +723,7 @@ void ScreenNameEntryTraditional::Backspace( PlayerNumber pn )
 
 void ScreenNameEntryTraditional::MenuLeft( const InputEventPlus &input )
 {
-	PlayerNumber pn = input.MenuI.player;
+	PlayerNumber pn = input.pn;
 	if( !m_bStillEnteringName[pn] || IsTransitioning()  )
 		return;
 
@@ -735,7 +735,7 @@ void ScreenNameEntryTraditional::MenuLeft( const InputEventPlus &input )
 
 void ScreenNameEntryTraditional::MenuRight( const InputEventPlus &input )
 {
-	PlayerNumber pn = input.MenuI.player;
+	PlayerNumber pn = input.pn;
 	if( !m_bStillEnteringName[pn] || IsTransitioning()  )
 		return;
 
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 3d0bcf2897..f5c72fb10d 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1445,7 +1445,7 @@ void HandleInputEvents(float fDeltaTime)
 		if( GAMESTATE->IsEventMode() &&
 			CodeDetector::EnteredCode(input.GameI.controller,CODE_BACK_IN_EVENT_MODE) )
 		{
-			input.MenuI.player = PLAYER_1;
+			input.pn = PLAYER_1;
 			input.MenuI.button = MENU_BUTTON_BACK;
 		}