diff --git a/ReallifeGamemode.Server/Events/Register.cs b/ReallifeGamemode.Server/Events/Register.cs
index 3a18f8a7..28ecacc0 100644
--- a/ReallifeGamemode.Server/Events/Register.cs
+++ b/ReallifeGamemode.Server/Events/Register.cs
@@ -20,11 +20,18 @@ namespace ReallifeGamemode.Server.Events
       string username = player.Name;
       using (var dbContext = new DatabaseContext())
       {
+        if (password.Length < 6)
+        {
+          player.TriggerEvent("SERVER:Login_Error", "Das Passwort muss aus mindestens 6 Zeichen bestehen.");
+          return;
+        }
         if (dbContext.Users.Where(u => u.SocialClubName == player.SocialClubName).Count() >= 3)
         {
           player.TriggerEvent("SERVER:Login_Error", "Es sind schon 3 Konten mit dieser Socialclub-ID registriert.");
+          return;
         }
-        else if (!dbContext.Users.Any(u => u.Name.ToLower() == username.ToLower().Trim()))
+
+        if (!dbContext.Users.Any(u => u.Name.ToLower() == username.ToLower().Trim()))
         {
           var user = new User
           {
diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index 5072f79c..b6542171 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -809,7 +809,7 @@ namespace ReallifeGamemode.Server.Managers
     [RemoteEvent("CLIENT:InteractionMenu_CallService_Sani")]
     public void CallServiceSani(Player player)
     {
-      if (player.GetUser().FactionId == 2)
+      if (player.GetUser().FactionId == 2 && player.IsDuty())
       {
         player.SendNotification("~r~[Fehler] ~w~Du kannst keinen Sanitäter rufen.");
         return;
diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs
index c8befc54..c8a88470 100644
--- a/ReallifeGamemode.Server/Managers/InventoryManager.cs
+++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs
@@ -74,7 +74,7 @@ namespace ReallifeGamemode.Server.Managers
     {
       if (player.IsInVehicle)
       {
-        player.TriggerEvent("Error", "Du kannst dein Kofferraum nicht betätigen.");
+        player.TriggerEvent("Error", "Du kannst deinen Kofferraum gerade nicht öffnen.");
       }
       Vehicle veh = NAPI.Pools.GetAllVehicles().ToList().Where(v => v.Position.DistanceTo(player.Position) <= 2).FirstOrDefault();
       if (veh == null)