Fix 940

This solves a problem in the interaction between our canonize and auth hooks.