EditOrganization works correctly now