diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index b649f40e9d..39777c06b5 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -177,14 +177,13 @@ void ScreenSystemLayer::RefreshCreditsMessages()
 	{
 		CString sCredits;
 
-		if( GAMESTATE->m_bIsOnSystemMenu ) // no mem card
+		bool bShowCreditsMessage = 
+			GAMESTATE->m_bIsOnSystemMenu || !GAMESTATE->m_bSideIsJoined[p];
+		
+		if( !bShowCreditsMessage )
 		{
-			sCredits = "";
-		}
-		else if( GAMESTATE->m_bSideIsJoined[p] )
-		{
-			MemoryCardState mcs = MEMCARDMAN->GetCardState( (PlayerNumber)p );
-			Profile* pProfile = PROFILEMAN->GetProfile( (PlayerNumber)p );
+			MemoryCardState mcs = MEMCARDMAN->GetCardState( p );
+			Profile* pProfile = PROFILEMAN->GetProfile( p );
 			if( pProfile )
 			{
 				sCredits = pProfile->GetDisplayName();
@@ -213,7 +212,7 @@ void ScreenSystemLayer::RefreshCreditsMessages()
 				}
 			}
 		}
-		else 
+		else // bShowCreditsMessage
 		{
 			switch( PREFSMAN->GetCoinMode() )
 			{
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index cf9a9d62b8..97f9f123fd 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1294,7 +1294,7 @@ void InsertCoin( int iNum )
 
 void InsertCredit()
 {
-	GAMESTATE->m_iCoins += PREFSMAN->m_iCoinsPerCredit;
+	InsertCoin( PREFSMAN->m_iCoinsPerCredit );
 }
 
 /* Returns true if the key has been handled and should be discarded, false if