diff --git a/src/command.c b/src/command.c
index a1c95e5df..74de35543 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1600,6 +1600,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 	{
 		// Enforce to default value without cheats.
 		overridestr = var->defaultvalue;
+		valstr = overridestr;
 	}
 
 	if (CV_CompleteValue(var, &overridestr, &overrideval))
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index acf9bdb1c..5e24839e8 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -924,7 +924,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 	strncpy(netbuffer->u.serverinfo.gametypename, Gametype_Names[prefgametype],
 			sizeof netbuffer->u.serverinfo.gametypename);
 	netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame;
-	netbuffer->u.serverinfo.cheatsenabled = (UINT8)CV_CheatsEnabled();
+	netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled();
 
 	netbuffer->u.serverinfo.kartvars = (UINT8) (
 		(gamespeed & SV_SPEEDMASK) |