diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
index e2541def035..4396bb9006d 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
@@ -26,3 +26,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
+    - Harpy # Frontier
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index a4498299c9a..1a8f2655d85 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -127,7 +127,7 @@
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
-    
+
 - type: entity
   save: false
   name: Urist McHands
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
index ea1069cbaaa..cc3e1543ee6 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -3,4 +3,8 @@
   name: Urist McHands The Dwarf
   parent: BaseMobDwarf
   id: MobDwarf
-
+  components:
+  - type: NpcFactionMember
+    factions:
+    - NanoTrasen
+    - Dwarf # Frontier
diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml
index 4563e92a96f..f81972dd77c 100644
--- a/Resources/Prototypes/_NF/ai_factions.yml
+++ b/Resources/Prototypes/_NF/ai_factions.yml
@@ -7,10 +7,10 @@
   - SimpleHostile
   - Dwarf
   - Felinid
+  - Harpy
   - Cat
   - Chicken
   - Monkey
-  - Mailman
 
 - type: npcFaction
   id: Dwarf
@@ -19,7 +19,7 @@
   id: Felinid
 
 - type: npcFaction
-  id: Mailman # Need ClothingAddFaction to work from Nyanotrasen code
+  id: Harpy
 
 - type: npcFaction
   id: Cat