diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
index bc21b3b9b..ab6db44c4 100644
--- a/source/core/gamecontrol.cpp
+++ b/source/core/gamecontrol.cpp
@@ -1030,6 +1030,7 @@ int RunGame()
 	}
 	if (isSWALL())
 	{
+		hud_showmapname->SetGenericRepDefault(false, CVAR_Bool);	// SW never had this feature, make it optional.
 		cl_weaponswitch->SetGenericRepDefault(1, CVAR_Int);
 		if (cl_weaponswitch > 1) cl_weaponswitch = 1;
 	}
diff --git a/source/core/gamecvars.cpp b/source/core/gamecvars.cpp
index 138710112..19a9f5db3 100644
--- a/source/core/gamecvars.cpp
+++ b/source/core/gamecvars.cpp
@@ -184,7 +184,7 @@ CUSTOM_CVARD(Int, hud_stats, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "enable/disabl
 {
 	if (self < 0 || self > 3) self = 0;
 }
-CVARD(Bool, hud_showmapname, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "enable/disable map name display on load")
+CVARD(Bool, hud_showmapname, true, CVAR_ARCHIVE, "enable/disable map name display on load")
 CVARD(Bool, hud_position, false, CVAR_ARCHIVE, "aligns the status bar to the bottom/top")
 CVARD(Bool, hud_bgstretch, false, CVAR_ARCHIVE, "enable/disable background image stretching in wide resolutions")
 CVARD(Bool, hud_messages, true, CVAR_ARCHIVE, "enable/disable showing messages")