diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
index 53718e31bce..d516d04d33f 100644
--- a/Resources/Maps/_NF/POI/nfsd.yml
+++ b/Resources/Maps/_NF/POI/nfsd.yml
@@ -13719,7 +13719,7 @@ entities:
     - type: Transform
       pos: 7.5,13.5
       parent: 1
-- proto: LockerNfsdSheriff
+- proto: LockerNfsdSheriffFilled
   entities:
   - uid: 218
     components:
@@ -13850,13 +13850,6 @@ entities:
     - type: Transform
       pos: 18.5,23.5
       parent: 1
-- proto: MedalCaseNfsd
-  entities:
-  - uid: 72
-    components:
-    - type: Transform
-      pos: 4.382657,9.643819
-      parent: 1
 - proto: MedicalBed
   entities:
   - uid: 41
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
index a5ced58be22..35b54731096 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
@@ -46,6 +46,19 @@
       - id: MedalCase # Frontier
       - id: Demag # Frontier
 
+- type: entity
+  id: LockerNfsdSheriffFilled
+  suffix: Filled
+  parent: LockerNfsdSheriff
+  components:
+  - type: StorageFill
+    contents:
+      - id: ShriffIDCard
+      - id: BoxHandcuff # Frontier
+      - id: CommsComputerCircuitboard # Frontier
+      - id: MedalCaseNfsd # Frontier
+      - id: Demag # Frontier
+
 - type: entity
   parent: GunSafe
   id: GunSafeSr
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml
index 10d451c2ac4..57d2b3fdd77 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml
@@ -25,6 +25,7 @@
     EncryptionKeyService: 4294967295 #Infinite
     EncryptionKeyNfsd: 5
     EncryptionKeyCommand: 5
+    AccessConfigurator: 2
 
 - type: vendingMachineInventory
   id: NFPTechNfsdInventory
@@ -70,3 +71,4 @@
     ClothingNeckNfsdBadgeWarden: 10
     ClothingNeckNfsdBadgeSheriff: 3
     ClothingMaskGasSheriff: 3
+    AccessConfigurator: 2
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml
index 2514a8669af..4be2be90090 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml
@@ -39,6 +39,5 @@
     - Flash
     - RubberStampSr
     - DoorRemoteCommand
-    - AccessConfigurator
     - EncryptionKeyStationMaster
     - EncryptionKeyCentCom