Fix for default-org selection during login
Merge pull request #696 from blrm/3rd-lvl-nav-fix

Fix for default-org selection during login