Auto retreat: Don't go back to your original orders after repair

I make pretty heavy use of autoretreat, but there is one huge pain: once repaired, units go back to their last orders. This was, most often, a move order somewhere hostile... so when you forget to go select them (a pain in retreating state) and cancel the orders... they just suicide into enemy lines.

Is there a way to change this behavior?