diff --git a/ReallifeGamemode.Client/Interaction/ammunation/ammunation.ts b/ReallifeGamemode.Client/Interaction/ammunation/ammunation.ts
index 52ab0fe2..2c1a6611 100644
--- a/ReallifeGamemode.Client/Interaction/ammunation/ammunation.ts
+++ b/ReallifeGamemode.Client/Interaction/ammunation/ammunation.ts
@@ -66,15 +66,12 @@ export default function ammunation(globalData: IGlobalData) {
 
         if (category < 9) { //Weapons aus Datenbank
             cWeapons.forEach(weapon => {
-                var weaponItem: NativeUI.UIMenuItem = new MenuItem(weapon.WeaponModel, "Munition: " + weapon.Ammo, [weapon.WeaponModel, weapon.Ammo, weapon.Price]);
+                var weaponItem: NativeUI.UIMenuItem = new MenuItem(weapon.WeaponModel, "Du erhältst " + weapon.Ammo + " Munition", [weapon.WeaponModel, weapon.Ammo, weapon.Price]);
                 categoryMenu.AddItem(weaponItem);
                 weaponItem.SetRightLabel("~g~$" + weapon.Price.toString());
-            })
-            categoryMenu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => {
-                mp.events.callRemote("CLIENT:Ammunation_BuyWeapon", item.Data[0], item.Data[1], item.Data[2]); //weaponmodel / ammo / price
-            });
+            })            
         } else { //Sonstiges = Schutzwesten / Fallschirme
-            var armorItem = new MenuItem("Schutzweste", "Sch\u00fctzt dich");
+            var armorItem = new MenuItem("Schutzweste", "Sch\u00fctzt dich","armor",);
             categoryMenu.AddItem(armorItem);
             armorItem.SetRightLabel("~g~$3000");
 
@@ -83,7 +80,9 @@ export default function ammunation(globalData: IGlobalData) {
             parachuteItem.SetRightLabel("~g~$500");           
         }
 
-        
+        categoryMenu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => {
+            mp.events.callRemote("CLIENT:Ammunation_BuyWeapon", item.Data[0], item.Data[1], item.Data[2]); //weaponmodel / ammo / price
+        });
 
         return categoryMenu;
     };
diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
index 00de3e94..ea213d7b 100644
--- a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
+++ b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
@@ -118,5 +118,24 @@ namespace ReallifeGamemode.Server.Events
         context.SaveChanges();
       }
     }
+
+    [RemoteEvent("CLIENT:Ammunation_BuyWeapon")]
+    public void AmmunationBuyWeapoon(Player player, string weaponmodel, int ammo, int price)
+    {
+      using (var dbContext = new DatabaseContext())
+      {
+        User user = player.GetUser(dbContext);
+
+        if (user.Handmoney < price)
+        {
+          player.SendNotification("Du hast nicht genügend Geld bei dir");
+          return;
+        }
+        user.Handmoney -= price;
+        dbContext.SaveChanges();
+        player.GiveWeapon(NAPI.Util.WeaponNameToModel(weaponmodel), ammo);
+        //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
+      }
+    }
   }
 }
diff --git a/ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs b/ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs
index 318ea6c5..fb30a048 100644
--- a/ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs
+++ b/ReallifeGamemode.Server/Shop/Ammunation/Ammunation.cs
@@ -36,25 +36,5 @@ namespace ReallifeGamemode.Server.Shop.Ammunation
       List<Weapon> shopWeapons = weaponList.ToList();
       client.TriggerEvent("AmmunationShop:LoadNativeUI", JsonConvert.SerializeObject(shopWeapons));
     }
-
-    [RemoteEvent("CLIENT:Ammunation_BuyWeapon")]
-    public void AmmunationBuyWeapoon(Player player, WeaponHash weaponmodel, int ammo , int price)
-    {
-      player.SendChatMessage("JO IS ANGEKOMMEN" + weaponmodel + "  " + ammo + "  " + price);
-      using (var dbContext = new DatabaseContext())
-      {
-        User user = player.GetUser(dbContext);
-
-        if (user.Handmoney < price)
-        {
-          player.SendNotification("Du hast nicht genügend Geld bei dir");
-          return;
-        }       
-        user.Handmoney -= price;
-        dbContext.SaveChanges();
-        player.GiveWeapon((WeaponHash)weaponmodel, ammo);
-        //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
-      }
-    }
   }
 }