diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index d7454f329a..884d1f50fe 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -31,7 +31,7 @@ PrefsManager::PrefsManager()
 	m_iDisplayResolution = 640;
 	m_iTextureResolution = 1024;
 	m_iRefreshRate = RageDisplay::REFRESH_DEFAULT;
-	m_bIgnoreJoyAxes = false;
+	m_bIgnoreJoyAxes = true;
 	m_bOnlyDedicatedMenuButtons = false;
 #ifdef _DEBUG
 	m_bShowStats = true;
diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index 56e39e6ab1..0819638e71 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -251,6 +251,8 @@ void ScreenTitleMenu::HandleScreenMessage( const ScreenMessage SM )
 
 			ASSERT( GAMESTATE->m_pCurSong );
 
+			GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
+
 			// choose some cool options
 			for( int p=0; p<NUM_PLAYERS; p++ )
 			{