Fix account issues.
Merge pull request #248 from jmpascal/MERGING-1

Fix account issues.