Account switch fix.
Merge pull request #255 from jmpascal/MERGING-1

Account switch fix.