Core/Commands: Fixing some problems with .account email
Merge pull request #10782 from Ascathor/master

Core/Commands: Fixing some problems with .account email