diff --git a/ReallifeGamemode.Client/Login/main.ts b/ReallifeGamemode.Client/Login/main.ts
index 3fe6e020..c0aa02b1 100644
--- a/ReallifeGamemode.Client/Login/main.ts
+++ b/ReallifeGamemode.Client/Login/main.ts
@@ -51,6 +51,9 @@ export default function (globalData: IGlobalData): void {
     });
 
     mp.events.add('CEF:Login_RegisterRequest', (password: string) => {
+        if (password.length < 6) {
+            return;
+        }
         mp.events.callRemote('CLIENT:Login_RegisterRequest', password);
     });
 
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;