diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index c287bace0b..4dfeef61c9 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -337,7 +337,9 @@ public abstract partial class SharedDoorSystem : EntitySystem
                 Audio.PlayPvs(keyholeComponent.DoorLockedSound, uid, AudioParams.Default.WithVolume(-3));
             }
 
-            Popup.PopupEntity(Loc.GetString("door-locked-via-key", ("door", uid)), uid);
+            if (user.HasValue)
+                Popup.PopupEntity(Loc.GetString("door-locked-via-key", ("door", uid)), uid, user.Value);
+
             return false;
         }
         // WD edit end
@@ -858,4 +860,4 @@ public abstract partial class SharedDoorSystem : EntitySystem
     }
 
 #endregion
-}
\ No newline at end of file
+}
diff --git a/Resources/Locale/ru-RU/white/object/tools/keyhole.ftl b/Resources/Locale/ru-RU/white/object/tools/keyhole.ftl
index 3966ca0bcc..027a7f5ded 100644
--- a/Resources/Locale/ru-RU/white/object/tools/keyhole.ftl
+++ b/Resources/Locale/ru-RU/white/object/tools/keyhole.ftl
@@ -1,3 +1,3 @@
-door-locked-via-key = {$door} закрыта
+door-locked-via-key = {CAPITALIZE($door)} закрыта
 door-keyhole-different-form = Форма замка этой двери не совпадает с формой ключа.
 construction-examine-condition-door-locked = Дверь не должна быть закрыта на ключ.