Changes to allow easy setup of an org if the user doesn't have an emailreceiver account.