diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs
index 5a89a26752..d9c6c25886 100644
--- a/Content.Server/Doors/Systems/DoorSystem.cs
+++ b/Content.Server/Doors/Systems/DoorSystem.cs
@@ -190,7 +190,7 @@ public sealed class DoorSystem : SharedDoorSystem
                 return true;
         }
 
-        var modEv = new DoorGetPryTimeModifierEvent();
+        var modEv = new DoorGetPryTimeModifierEvent(user);
         RaiseLocalEvent(target, modEv, false);
 
         door.BeingPried = true;
diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index 11029857b1..2597ca943f 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -11,6 +11,7 @@ using Content.Shared.Atmos.Monitor;
 using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.Popups;
 using Microsoft.Extensions.Options;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
@@ -144,12 +145,12 @@ namespace Content.Server.Doors.Systems
             if (state.Fire)
             {
                 _popupSystem.PopupEntity(Loc.GetString("firelock-component-is-holding-fire-message"),
-                    uid);
+                    uid, args.User, PopupType.MediumCaution);
             }
             else if (state.Pressure)
             {
                 _popupSystem.PopupEntity(Loc.GetString("firelock-component-is-holding-pressure-message"),
-                    uid);
+                    uid, args.User, PopupType.MediumCaution);
             }
 
             if (state.Fire || state.Pressure)
diff --git a/Content.Shared/Doors/DoorEvents.cs b/Content.Shared/Doors/DoorEvents.cs
index 591013d7fe..22c684c75a 100644
--- a/Content.Shared/Doors/DoorEvents.cs
+++ b/Content.Shared/Doors/DoorEvents.cs
@@ -68,7 +68,13 @@ namespace Content.Shared.Doors
     /// </summary>
     public sealed class DoorGetPryTimeModifierEvent : EntityEventArgs
     {
+        public readonly EntityUid User;
         public float PryTimeModifier = 1.0f;
+
+        public DoorGetPryTimeModifierEvent(EntityUid user)
+        {
+            User = user;
+        }
     }
 
     /// <summary>