diff --git a/KeycardButModern/KeycardButModern.cs b/KeycardButModern/KeycardButModern.cs
index 0784aa3..e57a77b 100644
--- a/KeycardButModern/KeycardButModern.cs
+++ b/KeycardButModern/KeycardButModern.cs
@@ -4,6 +4,7 @@ using LabApi.Events.Arguments.PlayerEvents;
 using LabApi.Events.Handlers;
 using LabApi.Features;
 using LabApi.Features.Console;
+using PlayerRoles;
 
 namespace KeycardButModern
 {
@@ -55,7 +56,17 @@ namespace KeycardButModern
 
             if (ev.Player.CurrentItem?.Base is KeycardItem keycard)
             {
-                if (ev.Generator.Base.CheckPermissions(keycard, out _)) return;
+                if (ev.Generator.Base.CheckPermissions(keycard, out _))
+                {
+                    ev.Generator.IsUnlocked = true;
+                    return;
+                }
+            }
+            
+            if (ev.Generator.IsUnlocked)
+            {
+                Logger.Debug("Generator can be opened; Unlocked");
+                return;
             }
 
 
@@ -70,6 +81,7 @@ namespace KeycardButModern
                 
                 if (!ev.Generator.Base.CheckPermissions(keycardItem, out _)) continue;
                 ev.Generator.IsOpen = !ev.Generator.IsOpen;
+                ev.Generator.IsUnlocked = true;
                 Logger.Debug("Generator can be opened");
                 
                 return;