diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 8e357c4ee9..f3b88007a5 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -269,6 +269,9 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
 			{
 				for(p=0; p < NUM_PLAYERS; p++)
 				{
+					if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) )
+						continue;	// skip
+
 					GAMESTATE->m_pUnlockingSys->UnlockAddDP( stageStats.iActualDancePoints[p] );
 					GAMESTATE->m_pUnlockingSys->UnlockAddAP( stageStats.iSongsPassed[p] );
 					GAMESTATE->m_pUnlockingSys->UnlockAddSP( stageStats.iSongsPassed[p] );
@@ -657,31 +660,6 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
 		}
 	}
 
-	// If unlocking is enabled, save the dance points
-	for( p=0; p<NUM_PLAYERS; p++)
-	{
-		/* XXX: This should be encapsulated in UnlockSystem, eg.
-		 * UnlockSystem::AddStats(const StageStats &stats). */
-		if( !PREFSMAN->m_bUseUnlockSystem )
-			continue;
-		if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) )
-			continue;	// skip
-
-		const float ArcadePoints[NUM_GRADES] = { -1 /* unused */, 0, 0, 1, 1, 1, 1, 10, 10 };
-		const float SongPoints[NUM_GRADES] = { -1, 0, 1, 2, 3, 4, 5, 10, 20 };
-
-		
-		// this is already done on lines 272-274
-
-		/* XXX: This should use stageStats.GetGrade, not m_Grades. 
-		const Grade g = m_Grades[p].GetGrade();
-		
-		PREFSMAN->m_fArcadePointsAccumulated += ArcadePoints[g];
-		PREFSMAN->m_fSongPointsAccumulated += SongPoints[g];
-
-		PREFSMAN->SaveGlobalPrefsToDisk(); */
-	}
-
 	bool bOneHasNewRecord = false;
 	for( p=0; p<NUM_PLAYERS; p++ )
 		if( GAMESTATE->IsPlayerEnabled(p) && bNewRecord[p] )