added switch to allow emails for usernames (temporarily commented out)