Fixed some bugs around adding users to orgs (based on changes to api)