Fixed handling for usernames which are e-mail addresses