Issue #678434 by Jon Pugh, hadsie, mikeryan: Fixed Don't generate username if the account->user is already set.