diff --git a/src/m_menu.c b/src/m_menu.c
index ada9ffb7a96c2b3817ce03ff9bc8f332070e8dcb..c76cc0f80e096b08713e41a10c3ec0279c8c5be7 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6139,10 +6139,10 @@ void M_TutorialSaveControlResponse(INT32 ch)
 	if (ch == 'y' || ch == KEY_ENTER)
 	{
 		G_CopyControls(gamecontrol, gamecontroldefault[tutorialgcs], gclist_tutorial, num_gclist_tutorial);
-		CV_Set(&cv_usemouse, cv_usemouse->defaultvalue);
-		CV_Set(&cv_alwaysfreelook, cv_alwaysfreelook->defaultvalue);
-		CV_Set(&cv_mousemove, cv_mousemove->defaultvalue);
-		CV_Set(&cv_analog, cv_analog->defaultvalue);
+		CV_Set(&cv_usemouse, cv_usemouse.defaultvalue);
+		CV_Set(&cv_alwaysfreelook, cv_alwaysfreelook.defaultvalue);
+		CV_Set(&cv_mousemove, cv_mousemove.defaultvalue);
+		CV_Set(&cv_analog, cv_analog.defaultvalue);
 		S_StartSound(NULL, sfx_itemup);
 	}
 	else
@@ -6163,10 +6163,10 @@ static void M_TutorialControlResponse(INT32 ch)
 			tutorialanalog = cv_analog.value;
 
 			G_CopyControls(gamecontrol, gamecontroldefault[tutorialgcs], gclist_tutorial, num_gclist_tutorial);
-			CV_Set(&cv_usemouse, cv_usemouse->defaultvalue);
-			CV_Set(&cv_alwaysfreelook, cv_alwaysfreelook->defaultvalue);
-			CV_Set(&cv_mousemove, cv_mousemove->defaultvalue);
-			CV_Set(&cv_analog, cv_analog->defaultvalue);
+			CV_Set(&cv_usemouse, cv_usemouse.defaultvalue);
+			CV_Set(&cv_alwaysfreelook, cv_alwaysfreelook.defaultvalue);
+			CV_Set(&cv_mousemove, cv_mousemove.defaultvalue);
+			CV_Set(&cv_analog, cv_analog.defaultvalue);
 
 			//S_StartSound(NULL, sfx_itemup);
 		}
diff --git a/src/m_misc.c b/src/m_misc.c
index 353443df0df2a28de2fcd222bf5cc6dc56aba7d7..92c2aeea9dd3458d66edc0f8495119542859998c 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -546,10 +546,10 @@ void M_SaveConfig(const char *filename)
 		CV_SetValue(&cv_mousemove, tutorialmousemove);
 		CV_SetValue(&cv_analog, tutorialanalog);
 		CV_SaveVariables(f);
-		CV_Set(&cv_usemouse, cv_usemouse->defaultvalue);
-		CV_Set(&cv_alwaysfreelook, cv_alwaysfreelook->defaultvalue);
-		CV_Set(&cv_mousemove, cv_mousemove->defaultvalue);
-		CV_Set(&cv_analog, cv_analog->default);
+		CV_Set(&cv_usemouse, cv_usemouse.defaultvalue);
+		CV_Set(&cv_alwaysfreelook, cv_alwaysfreelook.defaultvalue);
+		CV_Set(&cv_mousemove, cv_mousemove.defaultvalue);
+		CV_Set(&cv_analog, cv_analog.defaultvalue);
 	}
 	else
 		CV_SaveVariables(f);