diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index 924ac68c36..3f6d7cc036 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -83,7 +83,6 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
 
 	// Reset the current PlayMode
 	GAMESTATE->m_PlayMode = PLAY_MODE_INVALID;
-	GAMESTATE->m_bPlayersCanJoin = false;
 
 
 	int p;
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index 5b8e0fad16..89c98d596d 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -54,6 +54,8 @@ Desc: Sets up the screen display
 ScreenSelectMode::ScreenSelectMode()
 {
 	LOG->Trace( "ScreenSelectMode::ScreenSelectMode()" );
+	GAMESTATE->m_bPlayersCanJoin = true;
+	SCREENMAN->RefreshCreditsMessages();
 
 	
 	GAMESTATE->m_PlayMode = PLAY_MODE_ARCADE;	// the only mode you can select on this screen
@@ -340,6 +342,8 @@ void ScreenSelectMode::MenuStart( PlayerNumber pn )
 
 		TweenOffScreen();
 		m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen );
+		GAMESTATE->m_bPlayersCanJoin = false;
+		SCREENMAN->RefreshCreditsMessages();
 	}
 }
 
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index 8b059fff71..a8285ced09 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -257,6 +257,8 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn )
 	else if( -1!=sCurStyleName.Find("solo") )	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment solo") );
 
 	m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen );
+	GAMESTATE->m_bPlayersCanJoin = false;
+	SCREENMAN->RefreshCreditsMessages();
 
 	m_soundSelect.PlayRandom();
 
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index d43c03ed2c..68a00ffa40 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -518,7 +518,7 @@ void Song::TidyUpData()
 		GetDirListing( m_sSongDir + CString("*.avi"), arrayPossibleMovies );
 		GetDirListing( m_sSongDir + CString("*.mpg"), arrayPossibleMovies );
 		GetDirListing( m_sSongDir + CString("*.mpeg"), arrayPossibleMovies );
-		if( arrayPossibleMovies.GetSize() > 0 )
+		if( arrayPossibleMovies.GetSize() == 1 )
 		{
 			CString sBGMovieFile = arrayPossibleMovies[0];