diff --git a/src/mod_swift_travel_form.cpp b/src/mod_swift_travel_form.cpp
index 4c1a5c3..c4ef93a 100644
--- a/src/mod_swift_travel_form.cpp
+++ b/src/mod_swift_travel_form.cpp
@@ -65,18 +65,21 @@ public:
 class SwiftTravelForm_UnitScript : public UnitScript
 {
 public:
-    SwiftTravelForm_UnitScript() : UnitScript("SwiftTravelForm_UnitScript") {}
+    SwiftTravelForm_UnitScript()
+    : UnitScript("SwiftTravelForm_UnitScript", true, { UNITHOOK_ON_UNIT_SET_SHAPESHIFT_FORM })
+    {
+    }
 
     void OnUnitSetShapeshiftForm(Unit* unit, uint8 form) override
     {
-//        if (!sEnabled)
-//            return;
-//        if (!unit || unit->GetTypeId() != TYPEID_PLAYER)
-//            return;
+        if (!sEnabled)
+            return;
+        if (!unit || unit->GetTypeId() != TYPEID_PLAYER)
+            return;
 
         Player* player = unit->ToPlayer();
-//        if (!RequirementsMet(player))
-//            return;
+        if (!RequirementsMet(player))
+            return;
 
         if (form == FORM_TRAVEL)
             player->SetSpeed(MOVE_RUN, 2.0f, true);