diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs
index 234a1180fc..34ddb09bbb 100644
--- a/Content.Client/PDA/PdaBoundUserInterface.cs
+++ b/Content.Client/PDA/PdaBoundUserInterface.cs
@@ -50,6 +50,12 @@ namespace Content.Client.PDA
                 SendPredictedMessage(new ItemSlotButtonPressedEvent(PdaComponent.PdaPaiSlotId));
             };
 
+            // WD EDIT START
+            _menu.EjectPassportButton.OnPressed += _ =>
+            {
+                SendPredictedMessage(new ItemSlotButtonPressedEvent(PdaComponent.PdaPassportSlotId));
+            };
+            // WD EDIT END
             _menu.ActivateMusicButton.OnPressed += _ =>
             {
                 SendMessage(new PdaShowMusicMessage());
diff --git a/Content.Client/PDA/PdaMenu.xaml b/Content.Client/PDA/PdaMenu.xaml
index 8b26860332..142013bba0 100644
--- a/Content.Client/PDA/PdaMenu.xaml
+++ b/Content.Client/PDA/PdaMenu.xaml
@@ -21,6 +21,7 @@
         <pda:PdaNavigationButton Name="EjectPenButton" Access="Public" SetWidth="32"/>
         <pda:PdaNavigationButton Name="EjectIdButton" Access="Public" SetWidth="32"/>
         <pda:PdaNavigationButton Name="EjectPaiButton" Access="Public" SetWidth="32"/>
+        <pda:PdaNavigationButton Name="EjectPassportButton" Access="Public" SetWidth="32"/> <!-- WD EDIT -->
     </BoxContainer>
     <BoxContainer Name="ViewContainer" HorizontalExpand="True" VerticalExpand="True" Access="Public">
         <BoxContainer Orientation="Vertical"
diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
index 630861d084..f44e6b948b 100644
--- a/Content.Client/PDA/PdaMenu.xaml.cs
+++ b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -52,6 +52,7 @@ namespace Content.Client.PDA
             EjectPenButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/pencil.png"));
             EjectIdButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/eject.png"));
             EjectPaiButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/pai.png"));
+            EjectPassportButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/eject.png")); // WD EDIT
             ProgramCloseButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/Nano/cross.svg.png"));
 
 
@@ -188,6 +189,7 @@ namespace Content.Client.PDA
             EjectIdButton.IsActive = state.PdaOwnerInfo.IdOwner != null || state.PdaOwnerInfo.JobTitle != null;
             EjectPenButton.IsActive = state.HasPen;
             EjectPaiButton.IsActive = state.HasPai;
+            EjectPassportButton.IsActive = state.HasPassport; // WD EDIT
             ActivateMusicButton.Visible = state.CanPlayMusic;
             ShowUplinkButton.Visible = state.HasUplink;
             LockUplinkButton.Visible = state.HasUplink;
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index 9401d68de3..7339f94932 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -77,7 +77,7 @@ namespace Content.Server.PDA
 
         protected override void OnItemRemoved(EntityUid uid, PdaComponent pda, EntRemovedFromContainerMessage args)
         {
-            if (args.Container.ID != pda.IdSlot.ID && args.Container.ID != pda.PenSlot.ID && args.Container.ID != pda.PaiSlot.ID)
+            if (args.Container.ID != pda.IdSlot.ID && args.Container.ID != pda.PenSlot.ID && args.Container.ID != pda.PaiSlot.ID && args.Container.ID != pda.PassportSlot.ID) // WD EDIT
                 return;
 
             // TODO: This is super cursed just use compstates please.
@@ -173,6 +173,7 @@ namespace Content.Server.PDA
                 pda.FlashlightOn,
                 pda.PenSlot.HasItem,
                 pda.PaiSlot.HasItem,
+                pda.PassportSlot.HasItem, // WD EDIT
                 new PdaIdInfoText
                 {
                     ActualOwnerName = pda.OwnerName,
diff --git a/Content.Shared/PDA/PdaComponent.cs b/Content.Shared/PDA/PdaComponent.cs
index d4cfc4fc0d..c37fa3bd1b 100644
--- a/Content.Shared/PDA/PdaComponent.cs
+++ b/Content.Shared/PDA/PdaComponent.cs
@@ -12,6 +12,7 @@ namespace Content.Shared.PDA
         public const string PdaIdSlotId = "PDA-id";
         public const string PdaPenSlotId = "PDA-pen";
         public const string PdaPaiSlotId = "PDA-pai";
+        public const string PdaPassportSlotId = "PDA-passport"; // WD EDIT
 
         /// <summary>
         /// The base PDA sprite state, eg. "pda", "pda-clown"
@@ -24,9 +25,15 @@ namespace Content.Shared.PDA
 
         [DataField("penSlot")]
         public ItemSlot PenSlot = new();
+
         [DataField("paiSlot")]
         public ItemSlot PaiSlot = new();
 
+        // WD EDIT START
+        [DataField("passportSlot")]
+        public ItemSlot PassportSlot = new();
+        // WD EDIT END
+
         // Really this should just be using ItemSlot.StartingItem. However, seeing as we have so many different starting
         // PDA's and no nice way to inherit the other fields from the ItemSlot data definition, this makes the yaml much
         // nicer to read.
diff --git a/Content.Shared/PDA/PdaUpdateState.cs b/Content.Shared/PDA/PdaUpdateState.cs
index cf217ed9b2..64b711f1f2 100644
--- a/Content.Shared/PDA/PdaUpdateState.cs
+++ b/Content.Shared/PDA/PdaUpdateState.cs
@@ -11,6 +11,7 @@ namespace Content.Shared.PDA
         public bool FlashlightEnabled;
         public bool HasPen;
         public bool HasPai;
+        public bool HasPassport; // WD EDIT
         public PdaIdInfoText PdaOwnerInfo;
         public string? StationName;
         public bool HasUplink;
@@ -23,6 +24,7 @@ namespace Content.Shared.PDA
             bool flashlightEnabled,
             bool hasPen,
             bool hasPai,
+            bool hasPassport, // WD EDIT
             PdaIdInfoText pdaOwnerInfo,
             string? stationName,
             bool hasUplink = false,
@@ -33,6 +35,7 @@ namespace Content.Shared.PDA
             FlashlightEnabled = flashlightEnabled;
             HasPen = hasPen;
             HasPai = hasPai;
+            HasPassport = hasPassport; // WD EDIT
             PdaOwnerInfo = pdaOwnerInfo;
             HasUplink = hasUplink;
             CanPlayMusic = canPlayMusic;
diff --git a/Content.Shared/PDA/SharedPdaSystem.cs b/Content.Shared/PDA/SharedPdaSystem.cs
index bd291a3843..63f8b5c64d 100644
--- a/Content.Shared/PDA/SharedPdaSystem.cs
+++ b/Content.Shared/PDA/SharedPdaSystem.cs
@@ -29,6 +29,7 @@ namespace Content.Shared.PDA
             ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaIdSlotId, pda.IdSlot);
             ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaPenSlotId, pda.PenSlot);
             ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaPaiSlotId, pda.PaiSlot);
+            ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaPassportSlotId, pda.PassportSlot); // WD EDIT
 
             UpdatePdaAppearance(uid, pda);
         }
@@ -38,6 +39,7 @@ namespace Content.Shared.PDA
             ItemSlotsSystem.RemoveItemSlot(uid, pda.IdSlot);
             ItemSlotsSystem.RemoveItemSlot(uid, pda.PenSlot);
             ItemSlotsSystem.RemoveItemSlot(uid, pda.PaiSlot);
+            ItemSlotsSystem.RemoveItemSlot(uid, pda.PassportSlot); // WD EDIT
         }
 
         protected virtual void OnItemInserted(EntityUid uid, PdaComponent pda, EntInsertedIntoContainerMessage args)
diff --git a/Resources/Locale/en-US/_white/pda/pda-component.ftl b/Resources/Locale/en-US/_white/pda/pda-component.ftl
new file mode 100644
index 0000000000..7775ce9b50
--- /dev/null
+++ b/Resources/Locale/en-US/_white/pda/pda-component.ftl
@@ -0,0 +1 @@
+comp-pda-ui-eject-passport-button = Eject Passport
diff --git a/Resources/Locale/ru-RU/_white/pda/pda-component.ftl b/Resources/Locale/ru-RU/_white/pda/pda-component.ftl
new file mode 100644
index 0000000000..d90e72d95c
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/pda/pda-component.ftl
@@ -0,0 +1 @@
+comp-pda-ui-eject-passport-button = Извлечь паспорт
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 8429644feb..3fe3b10edc 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -41,6 +41,15 @@
       whitelist:
         components:
         - IdCard
+    # WD EDIT START
+    passportSlot:
+      priority: -1
+      ejectSound: /Audio/Machines/id_swipe.ogg
+      insertSound: /Audio/Machines/id_insert.ogg
+      whitelist:
+        components:
+        - Passport
+    # WD EDIT END
   - type: Item
     size: Small
   - type: ContainerContainer
@@ -48,6 +57,7 @@
       PDA-id: !type:ContainerSlot {}
       PDA-pen: !type:ContainerSlot {}
       PDA-pai: !type:ContainerSlot {}
+      PDA-passport: !type:ContainerSlot {} # WD EDIT
       Cartridge-Slot: !type:ContainerSlot {}
       program-container: !type:Container
   - type: ItemSlots