Index: code/client/cl_cgame.c
===================================================================
--- code/client/cl_cgame.c	(revision 1046)
+++ code/client/cl_cgame.c	(working copy)
@@ -746,6 +746,10 @@
 	// otherwise server commands sent just before a gamestate are dropped
 	VM_Call( cgvm, CG_INIT, clc.serverMessageSequence, clc.lastExecutedServerCommand, clc.clientNum );
 
+	// reset any CVAR_CHEAT cvars registered by cgame
+	if ( cl_connectedToPureServer )
+		Cvar_SetCheatState();
+
 	// we will send a usercmd this frame, which
 	// will cause the server to send us the first snapshot
 	cls.state = CA_PRIMED;
Index: code/client/cl_ui.c
===================================================================
--- code/client/cl_ui.c	(revision 1046)
+++ code/client/cl_ui.c	(working copy)
@@ -1171,6 +1171,10 @@
 		// init for this gamestate
 		VM_Call( uivm, UI_INIT, (cls.state >= CA_AUTHORIZING && cls.state < CA_ACTIVE) );
 	}
+
+	// reset any CVAR_CHEAT cvars registered by ui
+	if ( cl_connectedToPureServer ) 
+		Cvar_SetCheatState();
 }
 
 qboolean UI_usesUniqueCDKey( void ) {