[thejeff]

There should be a "change shape" option in your dragon's list of orders.
If your dragon went into battle as a dragon he should stay a dragon. If you order him to change, he should change back.* Possibly if he changes as a result of being wounded, he doesn't change back?


*Actually that's not quite true. If you order him to change, he will execute another change order after combat. As dragons only have two forms, this does the same thing. If the unit has three forms (only Skratti as far as I know), the after combat change order will move him to his third form.