diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
index f971e9c4..e6b3d90f 100644
--- a/config/menus_multiplayer.cfg
+++ b/config/menus_multiplayer.cfg
@@ -5,7 +5,7 @@ alias ingamemenu [ if (currole 1) [ showmenu "In-game admin" ] [ showmenu In-gam
 newmenu "In-game"
 
 menuitemtextinput "Nickname:  " "result $curname" "name $arg1"
-menuitem "Change to the enemy team"        [ if (curteam 1) [ team CLA; echo "You are now on team CLA" ] [ team RVSF; echo "You are now on team RVSF" ] ]
+menuitem "Change to the enemy team"        [ if (= (curteam) 1) [ team CLA; echo "You are now on team CLA" ] [ team RVSF; echo "You are now on team RVSF" ] ]
 menuitem "Change weapon"        	"showmenu Weapons"
 menuitem "Change player skin"          [showmenu (at [CLA RVSF] (curteam))]
 menuitem "" ""
@@ -29,7 +29,7 @@ menuitem "Change mastermode" 		"showmenu Mastermode"
 menuitem "Give admin"			[ showmenu "give admin" ]
 menuitem ""
 menuitemtextinput "Nickname:  " "result $curname" "name $arg1"
-menuitem "Change to the enemy team"        [ if (curteam 1) [ team CLA; echo "You are now on team CLA" ] [ team RVSF; echo "You are now on team RVSF" ] ]
+menuitem "Change to the enemy team"        [ if (= (curteam) 1) [ team CLA; echo "You are now on team CLA" ] [ team RVSF; echo "You are now on team RVSF" ] ]
 menuitem "Change weapon"        	"showmenu Weapons"
 menuitem "Change player skin"          [showmenu (at [CLA RVSF] (curteam))]
 menuitem "Demos"			"showmenu demo"
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index aee5a160..bf2ccec1 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -4,10 +4,10 @@ menudirlist "packages/misc/crosshairs" "png" "loadcrosshair (concatword $arg1 .p
 newmenu Weapons
 
 menumdl weapons/assault/menu mapmodel 75 12
-menuitem "MTP-57 Assault Rifle"			"nextprimary 5;echo MTP-57 Assault Rifle chosen" "chmenumdl weapons weapons/assault/menu mapmodel 75 12"
-menuitem "A-ARD/10 Submachine Gun"		"nextprimary 3;echo A-ARD/10 Submachine Gun chosen" "chmenumdl weapons weapons/subgun/menu mapmodel 75 12"
-menuitem "Precision Tech AD-81 Sniper Rifle"     "nextprimary 4;echo Precision Tech AD-81 Sniper Rifle chosen" "chmenumdl weapons weapons/sniper/menu mapmodel 75 12"
-menuitem "V-19 Combat Shotgun"			"nextprimary 2;echo V-19 Combat Shotgun chosen" "chmenumdl weapons weapons/shotgun/menu mapmodel 75 12"
+menuitem "MTP-57 Assault Rifle"			"nextprimary 5;echo MTP-57 Assault Rifle chosen" "chmenumdl Weapons weapons/assault/menu mapmodel 75 12"
+menuitem "A-ARD/10 Submachine Gun"		"nextprimary 3;echo A-ARD/10 Submachine Gun chosen" "chmenumdl Weapons weapons/subgun/menu mapmodel 75 12"
+menuitem "Precision Tech AD-81 Sniper Rifle"     "nextprimary 4;echo Precision Tech AD-81 Sniper Rifle chosen" "chmenumdl Weapons weapons/sniper/menu mapmodel 75 12"
+menuitem "V-19 Combat Shotgun"			"nextprimary 2;echo V-19 Combat Shotgun chosen" "chmenumdl Weapons weapons/shotgun/menu mapmodel 75 12"
 
 
 newmenu CLA