Move needed functionality from registration to order