diff --git a/src/m_cond.c b/src/m_cond.c
index f113cda42..c94a115ff 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -660,10 +660,7 @@ void M_ClearStats(void)
 	gamedata->chaokeytutorial = false;
 	gamedata->majorkeyskipattempted = false;
 	gamedata->enteredtutorialchallenge = false;
-	gamedata->finishedtutorialchallenge = false;
 	gamedata->sealedswapalerted = false;
-	gamedata->tutorialdone = false;
-	gamedata->playgroundroute = false;
 	gamedata->musicstate = GDMUSIC_NONE;
 
 	gamedata->importprofilewins = false;
@@ -778,6 +775,10 @@ void M_ClearSecrets(void)
 	gamedata->chaokeys = GDINIT_CHAOKEYS;
 	gamedata->prisoneggstothispickup = GDINIT_PRISONSTOPRIZE;
 
+	gamedata->tutorialdone = false;
+	gamedata->playgroundroute = false;
+	gamedata->finishedtutorialchallenge = false;
+
 	gamedata->gonerlevel = GDGONER_INIT;
 }
 
diff --git a/src/menus/main-goner.cpp b/src/menus/main-goner.cpp
index 3bcbb9269..0dd64e811 100644
--- a/src/menus/main-goner.cpp
+++ b/src/menus/main-goner.cpp
@@ -83,6 +83,7 @@ static void M_GonerAccessibilityTick(void)
 		if (!menumessage.active && !menutransition.dest)
 		{
 			M_SetupNextMenu(&MAIN_GonerDef, true);
+			M_GonerTick(); // tick once, for safety
 		}
 
 		return;
@@ -984,6 +985,8 @@ void M_GonerTick(void)
 				{.cvar = &cv_dummyextraspassword}, 0, 0};
 #endif
 
+		MAIN_Goner[0].mvar2 = 0;
+
 		if (gamedata->gonerlevel < GDGONER_INTRO)
 			gamedata->gonerlevel = GDGONER_INTRO;