diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
index 4801729395..f2cce28e84 100644
--- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
@@ -14,6 +14,7 @@ using Content.Shared.Physics;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;
+using Robust.Server.Interfaces.GameObjects;
 using Robust.Server.Interfaces.Timing;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects.Components.Transform;
@@ -45,8 +46,6 @@ namespace Content.Server.GameObjects.EntitySystems
         public override void Initialize()
         {
             base.Initialize();
-
-            SubscribeLocalEvent<PlayerAttachSystemMessage>(PlayerAttached);
             SubscribeLocalEvent<PlayerDetachedSystemMessage>(PlayerDetached);
 
             _audioSystem = EntitySystemManager.GetEntitySystem<AudioSystem>();
@@ -64,21 +63,8 @@ namespace Content.Server.GameObjects.EntitySystems
             }
         }
 
-        private static void PlayerAttached(PlayerAttachSystemMessage ev)
-        {
-            if (!ev.Entity.HasComponent<IMoverComponent>())
-            {
-                ev.Entity.AddComponent<PlayerInputMoverComponent>();
-            }
-        }
-
         private void PlayerDetached(PlayerDetachedSystemMessage ev)
         {
-            if (ev.Entity.HasComponent<PlayerInputMoverComponent>())
-            {
-                ev.Entity.RemoveComponent<PlayerInputMoverComponent>();
-            }
-
             if (ev.Entity.TryGetComponent(out IPhysicsComponent? physics) &&
                 physics.TryGetController(out MoverController controller) &&
                 !ev.Entity.IsWeightless())
diff --git a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs
index e2b46d4f23..610748cd5e 100644
--- a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs
+++ b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs
@@ -7,7 +7,6 @@ using Content.Server.Interfaces.GameTicking;
 using Content.Server.Mobs.Roles.Suspicion;
 using Content.Server.Players;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs.State;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.Player;
@@ -22,8 +21,7 @@ using Timer = Robust.Shared.Timers.Timer;
 namespace Content.Server.GameTicking.GameRules
 {
     /// <summary>
-    ///     Simple GameRule that will do a free-for-all death match.
-    ///     Kill everybody else to win.
+    ///     Simple GameRule that will do a TTT-like gamemode with traitors.
     /// </summary>
     public sealed class RuleSuspicion : GameRule, IEntityEventSubscriber
     {
diff --git a/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml b/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml
index d256e7187e..9139a10da5 100644
--- a/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml
+++ b/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml
@@ -32,6 +32,7 @@
     compatibility: Biological
     behaviors:
     - !type:BrainBehavior {}
+  - type: Input
 
 - type: entity
   id: EyesHuman
diff --git a/Resources/Prototypes/Body/Parts/humanoid_parts.yml b/Resources/Prototypes/Body/Parts/humanoid_parts.yml
index a6036e559f..3c2841ec8b 100644
--- a/Resources/Prototypes/Body/Parts/humanoid_parts.yml
+++ b/Resources/Prototypes/Body/Parts/humanoid_parts.yml
@@ -61,6 +61,7 @@
     resistances: defaultResistances
 #    criticalThreshold: 50
 #    deadThreshold: 120
+  - type: Input
 
 - type: entity
   id: LeftArmHuman
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index 7b29a537a2..1c67dc2a0f 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -17,6 +17,7 @@
       mask:
       - GhostImpassable
     status: InAir
+  - type: PlayerInputMover
   - type: Eye
     zoom: 0.5, 0.5
     drawFov: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index b9a8beff86..e85e369fe1 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -125,6 +125,7 @@
       layer:
       - Opaque
       - MobImpassable
+  - type: PlayerInputMover
   - type: AtmosExposed
   - type: Flammable
     fireSpread: true