Make contact form work on pages with references to things like shopping carts which need current_order

After chasing ways to make this work with a decorator, this change seems to make more sense.

Thanks