diff --git a/Source/Game/AI/SmartScripts/SmartScript.cs b/Source/Game/AI/SmartScripts/SmartScript.cs
index 851592001..c2604b308 100644
--- a/Source/Game/AI/SmartScripts/SmartScript.cs
+++ b/Source/Game/AI/SmartScripts/SmartScript.cs
@@ -1031,7 +1031,7 @@ namespace Game.AI
 
                         foreach (var obj in targets)
                             if (IsCreature(obj))
-                                obj.ToCreature().UpdateEntry(e.Action.updateTemplate.creature, null, e.Action.updateTemplate.updateLevel != 0);
+                                obj.ToCreature().UpdateEntry(e.Action.updateTemplate.creature, obj.ToCreature().GetCreatureData(), e.Action.updateTemplate.updateLevel != 0);
                         break;
                     }
                 case SmartActions.Die:
diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index 02fae2aa3..db82597c1 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -255,7 +255,7 @@ namespace Game.Entities
             SetHoverHeight(cinfo.HoverHeight);
 
             // checked at loading
-            m_defaultMovementType = (MovementGeneratorType)cinfo.MovementType;
+            m_defaultMovementType = (MovementGeneratorType)(data != null ? data.movementType : cinfo.MovementType);
             if (m_respawnradius == 0 && m_defaultMovementType == MovementGeneratorType.Random)
                 m_defaultMovementType = MovementGeneratorType.Idle;