Added additional check for usernames