Repopulating the org switcher menu each time it's opened, fixes #2178.
Merge pull request #2187 from waldenraines/fix_org_switcher_issues

Fixing #2178 by repopulating the org switcher menu each time it's opened.