Merge pull request #349 from settinghead/master

Persist ui flow state when redirecting
Remove extra link on "Switch to My Company" button

Fix for https://github.com/Rise-Vision/common-header/issues/344