druid fight class cant take flight paths because it spams catform

[retrostalgic 7]

anyone have a simple solution to this? Its something in that fight class that makes it always use cat form (faster travel) but when it talks to flight master it goes right back into cat and i cant take the flight. I was thinking adding a combat only condition to catform but then travel will be very slow, help a noob out? 

[Zan 99]

Make out of combat cat form only when moving.