diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
index d4cd0240..aacd4607 100644
--- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
+++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using GTANetworkAPI;
@@ -230,32 +230,9 @@ namespace ReallifeGamemode.Server.Job
       {
         if (data.getDataFromClient(player) == null) continue;
         Player target = data.getPartnerClient(player);
-                User user1 = player.GetUser();
-                User user2 = target.GetUser();
-                using (var dbContext = new DatabaseContext())
-                {
-                    user1 = player.GetUser(dbContext);
-                    user2 = target.GetUser(dbContext);
-                    user1.trashcount += 1;
-                    player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
-                    if (target != null) { 
-                      target.SendNotification("Müllsack: " + user2.trashcount + " von 20.");
-                      user2.trashcount += 1;
-                    }
-                    dbContext.SaveChanges();
-                }
-             player.AddAttachment("binbag", true);
-        if (target != null)
-        if (player.GetUser().trashcount >= 20)
-        {
-          ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
-          if (target != null) {
-            ChatService.SendMessage((Player)target, "~y~Job: ~s~Der Müllwagen ist voll! Er muss entleert werden.");
-            target.TriggerEvent("SERVER:MuellmannZuBase");
-          }
-          player.TriggerEvent("SERVER:MuellmannZuBase");
-        }
-        else
+        User user1 = player.GetUser();
+        User user2 = target.GetUser();
+        using (var dbContext = new DatabaseContext())
         {
           user1 = player.GetUser(dbContext);
           user2 = target.GetUser(dbContext);
@@ -273,7 +250,36 @@ namespace ReallifeGamemode.Server.Job
           if (player.GetUser().trashcount >= 20)
           {
             ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
-            if (target != null) {
+            if (target != null)
+            {
+              ChatService.SendMessage((Player)target, "~y~Job: ~s~Der Müllwagen ist voll! Er muss entleert werden.");
+              target.TriggerEvent("SERVER:MuellmannZuBase");
+            }
+            player.TriggerEvent("SERVER:MuellmannZuBase");
+          }
+          else
+          {
+            using (var dbContext = new DatabaseContext())
+            {
+              user1 = player.GetUser(dbContext);
+              user2 = target.GetUser(dbContext);
+              user1.trashcount += 1;
+              player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
+              if (target != null)
+              {
+                target.SendNotification("Müllsack: " + user2.trashcount + " von 20.");
+                user2.trashcount += 1;
+              }
+              dbContext.SaveChanges();
+            }
+          }
+        player.AddAttachment("binbag", true);
+        if (target != null)
+          if (player.GetUser().trashcount >= 20)
+          {
+            ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
+            if (target != null)
+            {
               ChatService.SendMessage((Player)target, "~y~Job: ~s~Der Müllwagen ist voll! Er muss entleert werden.");
               target.TriggerEvent("SERVER:MuellmannZuBase");
             }
diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs
index 4a93c0ff..45dd69f9 100644
--- a/ReallifeGamemode.Server/Managers/JobManager.cs
+++ b/ReallifeGamemode.Server/Managers/JobManager.cs
@@ -322,6 +322,7 @@ namespace ReallifeGamemode.Server.Managers
         }
       });
     }
+
     [RemoteEvent("CLIENT:Job_StopJob")]
     public void StopJob(Player player)
     {