Fix for logout errors while switching accounts
Merge pull request #495 from bhariharan/unstable

Fix for logout errors while switching accounts