diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index 34007bfb60..11cb410742 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -347,10 +347,16 @@ void LifeMeterBar::ChangeLife( TapNoteScore score )
 		m_iMissCombo++;
 	}
 
-	if( fDeltaLife > 0 )
-		fDeltaLife *= m_fLifeDifficulty;
-	else
-		fDeltaLife /= m_fLifeDifficulty;
+	switch( GAMESTATE->m_SongOptions.m_DrainType )
+	{
+	case SongOptions::DRAIN_NORMAL:
+	case SongOptions::DRAIN_NO_RECOVER:
+		if( fDeltaLife > 0 )
+			fDeltaLife *= m_fLifeDifficulty;
+		else
+			fDeltaLife /= m_fLifeDifficulty;
+		break;
+	}
 
 	m_fLifePercentage += fDeltaLife;
 	CLAMP( m_fLifePercentage, 0, 1 );
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 299e3bd8fd..99210147d8 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -293,6 +293,7 @@ void ScreenPlayerOptions::ImportOptions()
 	SongOptions &so = GAMESTATE->m_SongOptions;
 
 	m_iSelectedOption[0][SO_LIFE] = so.m_LifeType;
+	m_iSelectedOption[0][SO_DRAIN] = so.m_DrainType;
 	m_iSelectedOption[0][SO_BAT_LIVES] = so.m_iBatteryLives-1;
 
 	if ( m_iSelectedOption[0][SO_BAT_LIVES] < 0 )