diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index 977036a84d..265f22f29f 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -434,14 +434,18 @@ int ProfileManager::GetSongNumTimesPlayed( const Song* pSong, ProfileSlot slot )
 
 void ProfileManager::AddStepsScore( const Song* pSong, const Steps* pSteps, PlayerNumber pn, HighScore hs, int &iPersonalIndexOut, int &iMachineIndexOut )
 {
+	hs.sName = RANKING_TO_FILL_IN_MARKER[pn];
+	
 	if( hs.fPercentDP >= PREFSMAN->m_fMinPercentageForHighScore )
 	{
-		hs.sName = RANKING_TO_FILL_IN_MARKER[pn];
 		if( PROFILEMAN->IsUsingProfile(pn) )
 			PROFILEMAN->GetProfile(pn)->AddStepsHighScore( pSong, pSteps, hs, iPersonalIndexOut );
 		else
 			iPersonalIndexOut = -1;
-		PROFILEMAN->GetMachineProfile()->AddStepsHighScore( pSong, pSteps, hs, iMachineIndexOut );
+
+		// don't leave machine high scores for edits
+		if( pSteps->GetDifficulty() != DIFFICULTY_EDIT )
+			PROFILEMAN->GetMachineProfile()->AddStepsHighScore( pSong, pSteps, hs, iMachineIndexOut );
 	}
 
 	if( PROFILEMAN->IsUsingProfile(pn) )
diff --git a/stepmania/src/StepsUtil.cpp b/stepmania/src/StepsUtil.cpp
index de2564f3d8..30eebb8fd6 100644
--- a/stepmania/src/StepsUtil.cpp
+++ b/stepmania/src/StepsUtil.cpp
@@ -129,12 +129,14 @@ void StepsID::FromSteps( const Steps *p )
 		st = STEPS_TYPE_INVALID;
 		dc = DIFFICULTY_INVALID;
 		sDescription = "";
+		uHash = 0;
 	}
 	else
 	{
 		st = p->m_StepsType;
 		dc = p->GetDifficulty();
 		sDescription = p->GetDescription();
+		uHash = p->GetHash();
 	}
 }