Fix primary org as the current org if the user logged in
Merge pull request #129 from CruGlobal/MH-648

Fix primary org as the current org if the user logged in