diff --git a/common/src/main/scala/services/teamwork/SquadService.scala b/common/src/main/scala/services/teamwork/SquadService.scala
index 233eee1e..a75284c8 100644
--- a/common/src/main/scala/services/teamwork/SquadService.scala
+++ b/common/src/main/scala/services/teamwork/SquadService.scala
@@ -2230,8 +2230,8 @@ class SquadService extends Actor {
     val leadPosition = squad.Membership(0)
     leadPosition.Name = name
     leadPosition.CharId = player.CharId
-    leadPosition.Health = player.Health
-    leadPosition.Armor = player.Armor
+    leadPosition.Health = StatConverter.Health(player.Health, player.MaxHealth, min=1, max=64)
+    leadPosition.Armor = StatConverter.Health(player.Armor, player.MaxArmor, min=1, max=64)
     leadPosition.Position = player.Position
     leadPosition.ZoneId = 1
     squadFeatures += squad.GUID -> new SquadFeatures(squad).Start
diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala
index 58138808..2cea782e 100644
--- a/pslogin/src/main/scala/WorldSessionActor.scala
+++ b/pslogin/src/main/scala/WorldSessionActor.scala
@@ -11269,14 +11269,7 @@ class WorldSessionActor extends Actor
     squadService ! SquadServiceMessage(
       player,
       continent,
-      continent.GUID(player.VehicleSeated) match {
-        case Some(vehicle : Vehicle) =>
-          SquadServiceAction.Update(player.CharId, vehicle.Health, vehicle.MaxHealth, vehicle.Shields, vehicle.MaxShields, vehicle.Position, continent.Number)
-        case Some(obj : PlanetSideGameObject with WeaponTurret) =>
-          SquadServiceAction.Update(player.CharId, obj.Health, obj.MaxHealth, 0, 0, obj.Position, continent.Number)
-        case _ =>
-          SquadServiceAction.Update(player.CharId, player.Health, player.MaxHealth, player.Armor, player.MaxArmor, player.Position, continent.Number)
-      }
+      SquadServiceAction.Update(player.CharId, player.Health, player.MaxHealth, player.Armor, player.MaxArmor, player.Position, continent.Number)
     )
   }