diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 33479b447c..038df8af2f 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -417,14 +417,16 @@ void ScreenOptions::TweenCursor( PlayerNumber player_no )
 	highlight.SetXY( (float)iX, (float)iY );
 }
 
-void ScreenOptions::UpdateText( PlayerNumber player_no, int row )
+void ScreenOptions::UpdateText( PlayerNumber player_no, int iRow )
 {
-	int iChoiceInRow = m_iSelectedOption[player_no][row];
+	int iChoiceInRow = m_iSelectedOption[player_no][iRow];
 
-	bool bLotsOfOptions = m_bRowIsLong[row];
+	bool bLotsOfOptions = m_bRowIsLong[iRow];
+
+	OptionRow &row = m_OptionRow[iRow];
 
 	if( bLotsOfOptions )
-		m_textItems[row][player_no].SetText( m_OptionRow[row].choices[iChoiceInRow] );
+		m_textItems[iRow][row.bOneChoiceForAllPlayers?0:player_no].SetText( m_OptionRow[iRow].choices[iChoiceInRow] );
 }
 
 void ScreenOptions::UpdateEnabledDisabled()
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 1f57bfec9f..299e3bd8fd 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -64,7 +64,7 @@ OptionRow g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
 	OptionRow( "Hide",				false, "OFF","DARK","BLIND"),	
 	OptionRow( "Perspec\n-tive",	false, "" ),
 	OptionRow( "Step",				false, "" ),
-	OptionRow( "Character",			false, "" ),
+	OptionRow( "Charac\n-ter",		false, "" ),
 	OptionRow( "Life\nType",	true, "BAR","BATTERY" ),	
 	OptionRow( "Bar\nDrain",	true, "NORMAL","NO RECOVER","SUDDEN DEATH" ),	
 	OptionRow( "Bat\nLives",	true, "1","2","3","4","5","6","7","8","9","10" ),