diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 1aafce84f0..f64b3bae04 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -90,7 +90,6 @@ ScreenNameEntry::ScreenNameEntry()
 {
 	LOG->Trace( "ScreenNameEntry::ScreenNameEntry()" );
 
-
 	
 	// update cache
 	g_fCharsZoomSmall = CHARS_ZOOM_SMALL;
@@ -193,6 +192,9 @@ ScreenNameEntry::ScreenNameEntry()
 		if( !bNewHighScore )
 			continue;	// skip
 
+		// remove modifiers that may have been on the last song
+		GAMESTATE->m_PlayerOptions[p] = PlayerOptions();
+
 		ASSERT( GAMESTATE->IsPlayerEnabled(p) );	// they better be enabled if they made a high score!
 
 		m_GrayArrowRow[p].Load( (PlayerNumber)p );