Revert "Do not set selected company until cid in the URL is parsed"
Merge pull request #423 from Rise-Vision/revert-419-master

Revert "Do not set selected company until cid in the URL is parsed"