diff --git a/src/command.c b/src/command.c
index 6d9c86d3e..664eb950c 100644
--- a/src/command.c
+++ b/src/command.c
@@ -70,8 +70,12 @@ CV_PossibleValue_t CV_Natural[] = {{1, "MIN"}, {999999999, "MAX"}, {0, NULL}};
 
 //SRB2kart
 CV_PossibleValue_t kartspeed_cons_t[] = {
-	{0, "Easy"}, {1, "Normal"}, {2, "Hard"},
-	{0, NULL}};
+	{-1, "Auto"},
+	{0, "Easy"},
+	{1, "Normal"},
+	{2, "Hard"},
+	{0, NULL}
+};
 
 // Filter consvars by EXECVERSION
 // First implementation is 2 (1.0.2), so earlier configs default at 1 (1.0.0)
@@ -1769,7 +1773,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 				{
 					newvalue = var->value + 1;
 					if (newvalue > maxspeed)
-						newvalue = 0;
+						newvalue = -1;
 					var->value = newvalue;
 					var->string = var->PossibleValue[var->value].strvalue;
 					var->func();
@@ -1778,7 +1782,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 				else if (increment < 0) // Going down!
 				{
 					newvalue = var->value - 1;
-					if (newvalue < 0)
+					if (newvalue < -1)
 						newvalue = maxspeed;
 					var->value = newvalue;
 					var->string = var->PossibleValue[var->value].strvalue;
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 523c92778..d67f6b48e 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1351,7 +1351,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 	netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled();
 
 	netbuffer->u.serverinfo.kartvars = (UINT8) (
-		(cv_kartspeed.value & SV_SPEEDMASK) |
+		(gamespeed & SV_SPEEDMASK) |
 		(dedicated ? SV_DEDICATED : 0) |
 		(D_IsJoinPasswordOn() ? SV_PASSWORD : 0)
 	);
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index a5085864e..29a09fb06 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -360,12 +360,13 @@ consvar_t cv_kartminimap = {"kartminimap", "4", CV_SAVE, kartminimap_cons_t, NUL
 consvar_t cv_kartcheck = {"kartcheck", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t kartinvinsfx_cons_t[] = {{0, "Music"}, {1, "SFX"}, {0, NULL}};
 consvar_t cv_kartinvinsfx = {"kartinvinsfx", "SFX", CV_SAVE, kartinvinsfx_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_kartspeed = {"kartspeed", "Normal", CV_NETVAR|CV_CALL|CV_NOINIT, kartspeed_cons_t, KartSpeed_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartspeed = {"kartspeed", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartspeed_cons_t, KartSpeed_OnChange, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t kartbumpers_cons_t[] = {{1, "MIN"}, {12, "MAX"}, {0, NULL}};
 consvar_t cv_kartbumpers = {"kartbumpers", "3", CV_NETVAR|CV_CHEAT, kartbumpers_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_kartfrantic = {"kartfrantic", "Off", CV_NETVAR|CV_CHEAT|CV_CALL|CV_NOINIT, CV_OnOff, KartFrantic_OnChange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_kartcomeback = {"kartcomeback", "On", CV_NETVAR|CV_CHEAT|CV_CALL|CV_NOINIT, CV_OnOff, KartComeback_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_kartencore = {"kartencore", "Off", CV_NETVAR|CV_CALL|CV_NOINIT, CV_OnOff, KartEncore_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t kartencore_cons_t[] = {{-1, "Auto"}, {0, "Off"}, {1, "On"}, {0, NULL}};
+consvar_t cv_kartencore = {"kartencore", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartencore_cons_t, KartEncore_OnChange, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t kartvoterulechanges_cons_t[] = {{0, "Never"}, {1, "Sometimes"}, {2, "Frequent"}, {3, "Always"}, {0, NULL}};
 consvar_t cv_kartvoterulechanges = {"kartvoterulechanges", "Frequent", CV_NETVAR, kartvoterulechanges_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t kartspeedometer_cons_t[] = {{0, "Off"}, {1, "Percentage"}, {2, "Kilometers"}, {3, "Miles"}, {4, "Fracunits"}, {0, NULL}};
@@ -376,8 +377,6 @@ consvar_t cv_kartvoices = {"kartvoices", "Tasteful", CV_SAVE, kartvoices_cons_t,
 consvar_t cv_karteliminatelast = {"karteliminatelast", "Yes", CV_NETVAR|CV_CHEAT|CV_CALL|CV_NOSHOWHELP, CV_YesNo, KartEliminateLast_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_kartusepwrlv = {"kartusepwrlv", "Yes", CV_NETVAR|CV_CHEAT, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_speedscramble = {"kartscramblespeed", "Yes", CV_NETVAR|CV_CHEAT, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_encorescramble = {"kartscrambleencore", "Yes", CV_NETVAR|CV_CHEAT, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t kartdebugitem_cons_t[] = {{-1, "MIN"}, {NUMKARTITEMS-1, "MAX"}, {0, NULL}};
 consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -5783,7 +5782,7 @@ static void KartSpeed_OnChange(void)
 	if (!M_SecretUnlocked(SECRET_HARDSPEED) && cv_kartspeed.value == 2)
 	{
 		CONS_Printf(M_GetText("You haven't earned this yet.\n"));
-		CV_StealthSetValue(&cv_kartspeed, 1);
+		CV_StealthSetValue(&cv_kartspeed, cv_kartspeed.defaultvalue);
 		return;
 	}
 
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 7d81f1164..d1f28665c 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -122,8 +122,6 @@ extern consvar_t cv_kartspeedometer;
 extern consvar_t cv_kartvoices;
 extern consvar_t cv_karteliminatelast;
 extern consvar_t cv_kartusepwrlv;
-extern consvar_t cv_speedscramble;
-extern consvar_t cv_encorescramble;
 
 extern consvar_t cv_votetime;
 
diff --git a/src/g_game.c b/src/g_game.c
index 4459abe52..642f62bc1 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3408,7 +3408,7 @@ INT16 G_SometimesGetDifferentGametype(void)
 		randmapbuffer[NUMMAPS]--;
 		if (encorepossible)
 		{
-			if (encorescramble >= 0)
+			if (encorescramble != -1)
 				encorepossible = (boolean)encorescramble; // FORCE to what was scrambled on intermission
 			else
 			{
diff --git a/src/k_kart.c b/src/k_kart.c
index 83b48c4a9..230662d2a 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -580,8 +580,6 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_kartvoices);
 	CV_RegisterVar(&cv_karteliminatelast);
 	CV_RegisterVar(&cv_kartusepwrlv);
-	CV_RegisterVar(&cv_speedscramble);
-	CV_RegisterVar(&cv_encorescramble);
 	CV_RegisterVar(&cv_votetime);
 
 	CV_RegisterVar(&cv_kartdebugitem);
diff --git a/src/k_pwrlv.c b/src/k_pwrlv.c
index 31a4bd314..c1096d4a3 100644
--- a/src/k_pwrlv.c
+++ b/src/k_pwrlv.c
@@ -118,7 +118,7 @@ void K_SetPowerLevelScrambles(SINT8 powertype)
 	switch (powertype)
 	{
 		case PWRLV_RACE:
-			if (cv_speedscramble.value || cv_encorescramble.value)
+			if (cv_kartspeed.value == -1 || cv_kartencore.value == -1)
 			{
 				boolean hardmode = false;
 				boolean encore = false;
@@ -187,12 +187,12 @@ void K_SetPowerLevelScrambles(SINT8 powertype)
 						break;
 				}
 
-				if (cv_speedscramble.value)
+				if (cv_kartspeed.value == -1)
 					speedscramble = (hardmode ? 2 : 1);
 				else
 					speedscramble = -1;
 
-				if (cv_encorescramble.value)
+				if (cv_kartencore.value == -1)
 					encorescramble = (encore ? 1 : 0);
 				else
 					encorescramble = -1;
diff --git a/src/p_setup.c b/src/p_setup.c
index 3498c443b..7ffe84d0a 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2398,8 +2398,8 @@ static void P_LevelInitStuff(void)
 			gamespeed = 0;
 		else
 		{
-			if (cv_speedscramble.value && speedscramble != -1)
-				gamespeed = (UINT8)speedscramble;
+			if (cv_kartspeed.value == -1)
+				gamespeed = ((speedscramble == -1) ? cv_kartspeed.defaultvalue : (UINT8)speedscramble);
 			else
 				gamespeed = (UINT8)cv_kartspeed.value;
 		}