diff --git a/src/client.c b/src/client.c
index 71f670d9..bcb28732 100644
--- a/src/client.c
+++ b/src/client.c
@@ -2149,9 +2149,7 @@ void PutClientInServer(void)
 			items |= IT_SUPER_SHOTGUN;
 			items |= IT_ROCKET_LAUNCHER;
 			items |= IT_GRENADE_LAUNCHER;
-
-			if (streq(mapname, "dm3") || streq(mapname, "dm4"))
-				items |= IT_LIGHTNING;
+			items |= IT_LIGHTNING;
 
 			items &= ~( IT_ARMOR1 | IT_ARMOR2 | IT_ARMOR3);
 			if (!self->isBot)
diff --git a/src/commands.c b/src/commands.c
index 487499a8..5b05c69c 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -4427,6 +4427,7 @@ const char tot_um_init[] =
 	"dq 0\n"
 	"dr 0\n"
 	"k_bzk 0\n"
+	"k_disallow_weapons 80\n"
 	"k_exttime 0\n"
 	"k_fb_enabled 1\n"
 	"k_fb_quad_multiplier 8\n"