diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
index 9b53448c7d..c1b43e3984 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -34,7 +34,7 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
-    
+
 - type: entity
   parent: WindoorSecure
   id: WindoorChemistryLocked
@@ -78,7 +78,7 @@
     access: [["Security"]]
   - type: Wires
     LayoutId: WindoorSecurity
-    
+
 - type: entity
   parent: WindoorSecurityLocked
   id: WindoorBrigLocked
@@ -86,7 +86,15 @@
   components:
   - type: AccessReader
     access: [["Brig"]]
-    
+
+- type: entity
+  parent: WindoorSecurityLocked
+  id: WindoorArmoryLocked
+  suffix: Armory, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorEngineeringLocked
@@ -94,7 +102,7 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-    
+
 - type: entity
   parent: WindoorSecure
   id: WindoorChapelLocked
@@ -102,7 +110,7 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
-    
+
 - type: entity
   parent: WindoorSecure
   id: WindoorJanitorLocked
@@ -110,11 +118,11 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
-    
+
 - type: entity
   parent: WindoorSecure
   id: WindoorKitchenLocked
   suffix: Kitchen, Locked
   components:
   - type: AccessReader
-    access: [["Kitchen"]]
\ No newline at end of file
+    access: [["Kitchen"]]
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index e06cdb9a57..277a0cb892 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -32,7 +32,7 @@
       state_open: qm_open
       state_closed: qm_door
   - type: AccessReader
-    access: [["Quartermaster"]] 
+    access: [["Quartermaster"]]
 
 # Command
 - type: entity
@@ -286,7 +286,7 @@
       state_open: warden_open
       state_closed: warden_door
   - type: AccessReader
-    access: [["Brig"]]
+    access: [["Armory"]]
 
 # Security Officer
 - type: entity
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 43e3b7ccfd..bf986ef773 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -8,6 +8,7 @@
   supervisors: "the head of personnel"
   access:
   - Service
+  - Brig
   - Maintenance
 
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index 85a88ddb59..aeace63534 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -9,6 +9,7 @@
   canBeAntag: false
   access:
   - Security
+  - Brig
   - Maintenance
   - Service