Fixed a logic error that caused a problem later when the account name