diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 6cb07096628..c03f6649edd 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -41,7 +41,7 @@
 	var/list/topiclimiter
 
 	// comment out the line below when debugging locally to enable the options & messages menu
-	//control_freak = 1
+	control_freak = CONTROL_FREAK_ALL
 
 	var/ssd_warning_acknowledged = FALSE
 
@@ -56,8 +56,6 @@
 
 	var/global/obj/screen/click_catcher/void
 
-	control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS
-
 	var/ip_intel = "Disabled"
 
 	var/datum/click_intercept/click_intercept = null