diff --git a/ReallifeGamemode.Database/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs
index c0ecb0bd..054d124e 100644
--- a/ReallifeGamemode.Database/Entities/User.cs
+++ b/ReallifeGamemode.Database/Entities/User.cs
@@ -24,6 +24,9 @@ namespace ReallifeGamemode.Database.Entities
     [NotMapped]
     private int _handMoney;
 
+    public delegate void UserHandMoneyChangedEvent(User account);
+    public static event UserHandMoneyChangedEvent HandMoneyChanged;
+
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public int Id { get; set; }
@@ -50,7 +53,7 @@ namespace ReallifeGamemode.Database.Entities
       set
       {
         _handMoney = value;
-        Player?.TriggerEvent("SERVER:SET_HANDMONEY", value);
+
       }
     }
 
@@ -92,7 +95,7 @@ namespace ReallifeGamemode.Database.Entities
       set
       {
         this._wanteds = value;
-        Player.TriggerEvent("SERVER:SetWanteds", value);
+        HandMoneyChanged?.Invoke(this);
       }
     }
 
@@ -116,7 +119,7 @@ namespace ReallifeGamemode.Database.Entities
     [NotMapped]
     public Player Player
     {
-      get => NAPI.Pools.GetAllPlayers()?.Where(c => c?.Name?.ToLower() == this?.Name?.ToLower()).FirstOrDefault();
+      get => NAPI.Pools.GetAllPlayers().Where(c => c.Name.ToLower() == this.Name.ToLower()).FirstOrDefault();
     }
 
     [NotMapped]
diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs
index c81678c9..c80f4ce0 100644
--- a/ReallifeGamemode.Server/Main.cs
+++ b/ReallifeGamemode.Server/Main.cs
@@ -130,6 +130,11 @@ namespace ReallifeGamemode.Server
           PlayerService.GetPlayerByNameOrId(user).TriggerEvent("updateMoney", account.Balance);
         }
       };
+
+      User.HandMoneyChanged += (user) =>
+      {
+        user.Player.TriggerEvent("SERVER:SetWanteds", user.Handmoney);
+      }
     }
 
     [RemoteEvent("CLIENT:Event")]