diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index 8b5e811ae..ff693b112 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -3059,7 +3059,7 @@ namespace Game.Entities
                 m_combatPulseTime = delay;
         }
 
-        bool IsRegeneratingHealth() { return m_regenHealth; }
+        public bool IsRegeneratingHealth() { return m_regenHealth; }
         public void SetRegeneratingHealth(bool regenHealth) { m_regenHealth = regenHealth; }
 
         public void SetHomePosition(float x, float y, float z, float o)
diff --git a/Source/Game/Movement/Generators/HomeMovement.cs b/Source/Game/Movement/Generators/HomeMovement.cs
index 1f3c284ce..69a055637 100644
--- a/Source/Game/Movement/Generators/HomeMovement.cs
+++ b/Source/Game/Movement/Generators/HomeMovement.cs
@@ -47,7 +47,11 @@ namespace Game.AI
                 owner.SetWalk(true);
                 owner.LoadCreaturesAddon();
                 owner.GetAI().JustReachedHome();
-                owner.SetSpawnHealth();
+                if (owner.IsRegeneratingHealth())
+                {
+                    owner.SetFullHealth();
+                    owner.SetPower(PowerType.Mana, owner.GetMaxPower(PowerType.Mana));
+                }
             }
         }