fixes #5854 - org creation non-admin normal user doesn't add the org name in org switcher