diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 5bd53b1e1d..fa31673230 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -40,9 +40,9 @@ ScreenManager*	SCREENMAN = NULL;	// global and accessable from anywhere in our p
 #define CREDITS_INSERT_CARD		THEME->GetMetric ("ScreenSystemLayer","CreditsInsertCard")
 #define CREDITS_CARD_ERROR		THEME->GetMetric ("ScreenSystemLayer","CreditsCardError")
 #define CREDITS_CARD_TOO_LATE	THEME->GetMetric ("ScreenSystemLayer","CreditsCardTooLate")
-#define CREDITS_TEXT_HOME		THEME->GetMetric ("ScreenSystemLayer","CreditsTextHome")
-#define CREDITS_TEXT_FREE_PLAY	THEME->GetMetric ("ScreenSystemLayer","CreditsTextFreePlay")
-#define CREDITS_TEXT_CREDITS	THEME->GetMetric ("ScreenSystemLayer","CreditsTextCredits")
+#define CREDITS_FREE_PLAY		THEME->GetMetric ("ScreenSystemLayer","CreditsFreePlay")
+#define CREDITS_CREDITS			THEME->GetMetric ("ScreenSystemLayer","CreditsCredits")
+#define CREDITS_NOT_PRESENT		THEME->GetMetric ("ScreenSystemLayer","CreditsNotPresent")
 #define CREDITS_JOIN_ONLY		THEME->GetMetricB("ScreenSystemLayer","CreditsJoinOnly")
 
 const int NUM_SKIPS_TO_SHOW = 5;
@@ -198,37 +198,29 @@ void ScreenSystemLayer::RefreshCreditsMessages()
 				}
 			}
 		}
-		else if( GAMESTATE->PlayersCanJoin() )
-		{
-			sCredits = CREDITS_PRESS_START;
-
-			if( PREFSMAN->m_iCoinMode==COIN_PAY  && 
-				PREFSMAN->m_Premium!=PrefsManager::JOINT_PREMIUM  &&
-				GAMESTATE->m_iCoins<PREFSMAN->m_iCoinsPerCredit )
-			{
-				int Coins = GAMESTATE->m_iCoins % PREFSMAN->m_iCoinsPerCredit;
-				sCredits = ssprintf("%s %d", CREDITS_TEXT_CREDITS.c_str(), GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit);
-				if (Coins)
-					sCredits += ssprintf("  %d/%d", Coins, PREFSMAN->m_iCoinsPerCredit );
-			}
-		}
-		else
+		else 
 		{
 			switch( PREFSMAN->m_iCoinMode )
 			{
 			case COIN_HOME:
-				sCredits = CREDITS_TEXT_HOME;
+				if( GAMESTATE->PlayersCanJoin() )
+					sCredits = CREDITS_PRESS_START;
+				else
+					sCredits = CREDITS_NOT_PRESENT;
 				break;
 			case COIN_PAY:
 				{
 					int Coins = GAMESTATE->m_iCoins % PREFSMAN->m_iCoinsPerCredit;
-					sCredits = ssprintf("%s %d", CREDITS_TEXT_CREDITS.c_str(), GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit);
+					sCredits = ssprintf("%s %d", CREDITS_CREDITS.c_str(), GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit);
 					if (Coins)
 						sCredits += ssprintf("  %d/%d", Coins, PREFSMAN->m_iCoinsPerCredit );
 				}
 				break;
 			case COIN_FREE:
-				sCredits = CREDITS_TEXT_FREE_PLAY;
+				if( GAMESTATE->PlayersCanJoin() )
+					sCredits = CREDITS_FREE_PLAY;
+				else
+					sCredits = CREDITS_NOT_PRESENT;
 				break;
 			default:
 				ASSERT(0);