make a few changes to the workflow for creating an organization