diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp
index 2330c23869..751c590fc6 100644
--- a/src/PrefsManager.cpp
+++ b/src/PrefsManager.cpp
@@ -125,16 +125,15 @@ XToString( CourseSortOrders );
 StringToX( CourseSortOrders );
 LuaXType( CourseSortOrders );
 
-// XXX: Fix fail bug?
-/* static const char *DefaultFailTypeNames[] = {
+static const char *DefaultFailTypeNames[] = {
 	"Immediate",
 	"ImmediateContinue",
-	"EndOfSong",
+	"AtEnd",
 	"Off",
 };
 XToString( DefaultFailType );
 StringToX( DefaultFailType );
-LuaXType( DefaultFailType ); */
+LuaXType( DefaultFailType );
 
 bool g_bAutoRestart = false;
 #ifdef DEBUG
@@ -191,6 +190,8 @@ PrefsManager::PrefsManager() :
 
 	m_fLifeDifficultyScale	( "LifeDifficultyScale",	1.0f ),
 
+	m_sDefaultFailType ("DefaultFailType", FAIL_IMMEDIATE),
+
 
 	m_iRegenComboAfterMiss		( "RegenComboAfterMiss",	5 ),
 	m_bMercifulDrain		( "MercifulDrain",		true ),	// negative life deltas are scaled by the players life percentage
diff --git a/src/PrefsManager.h b/src/PrefsManager.h
index 589da26533..12a44c5b85 100644
--- a/src/PrefsManager.h
+++ b/src/PrefsManager.h
@@ -115,8 +115,8 @@ enum CourseSortOrders
 enum DefaultFailType
 {
 	FAIL_IMMEDIATE,
-	FAIL_IMMEDIATECONTINUE,
-	FAIL_ENDOFSONG,
+	FAIL_IMMEDIATE_CONTINUE,
+	FAIL_AT_END,
 	FAIL_OFF,
 	NUM_DefaultFailType,
 	DefaultFailType_Invalid
@@ -286,7 +286,9 @@ public:
 
 	/** @brief Enable some quirky behavior used by some older versions of StepMania. */
 	Preference<bool>	m_bQuirksMode;
-	// Preference<RString> m_sDefaultFailType; // XXX: Fix fail bug?
+	
+	/** @brief The specific failure type to use at the beginning. */
+	Preference<DefaultFailType> m_sDefaultFailType;
 
 	// Debug:
 	Preference<bool>	m_bLogToDisk;