[Bugfix] Ensure the org switch flow works with redirect#327

ikovic merged 2 commits intomainslashid/javascript:mainfrom

sid-fix-org-switching-with-redirectslashid/javascript:sid-fix-org-switching-with-redirectCopy head branch name to clipboard