Core/Commands: Fixing some problems with .account email