diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg
index c4391aa1..867619c7 100644
--- a/config/menus_bot.cfg
+++ b/config/menus_bot.cfg
@@ -67,9 +67,9 @@ newmenu singleplayer
 // teamplay not mature yet
 menuitem "Bot Team Deathmatch"    [ tmp_mode = 7; showmenu botskill ]
 menuitem "Bot Deathmatch"         [ tmp_mode = 8; showmenu botskill ]
-menuitem "Bot One Shot, One Kill" [ alias tmp_mode 12; showmenu botskill ]
-menuitem [] -1
+menuitem "Bot One Shot, One Kill" [ tmp_mode = 12; showmenu botskill ]
 menuitem "Bot Survival"           [ showmenu "Survival Mode" ]
+menuitem [] -1
 menuitem "Empty Map"              emptymap
 
 newmenu botskill
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 2e6bfa57..d3d9ee6f 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -5,6 +5,7 @@
 #include "hudgun.h"
 
 VARP(autoreload, 0, 1, 1);
+VARP(akimboautoswitch, 0, 1, 1);
 VARP(akimboendaction, 0, 0, 2); // 0: stay with pistol, 1: back to primary, 2: grenade - all fallback to previous one w/o ammo for target
 struct sgray {
     int ds; // damage flag: outer, medium, center: SGSEGDMG_*
@@ -1445,7 +1446,8 @@ void akimbo::onammopicked()
     akimbomillis = lastmillis + 30000;
     if(owner==player1)
     {
-        if(owner->weaponsel->type!=GUN_SNIPER && owner->weaponsel->type!=GUN_GRENADE) owner->weaponswitch(this);
+        // if(owner->weaponsel->type!=GUN_SNIPER && owner->weaponsel->type!=GUN_GRENADE) owner->weaponswitch(this);
+        if(akimboautoswitch) owner->weaponswitch(this); // Give the client full control over akimbo auto-switching // Bukz 2011apr23
         addmsg(SV_AKIMBO, "ri", lastmillis);
     }
 }