Fixes #284 restricted access to org for non-admin user