Merge pull request #166 from COPPER-BOBCAT/staging

Staging
fixed bug in account
Merge pull request #167 from power9/master

fixed bug in account