Allow Email as the User Name
remove commended code
Merge pull request #191 from sabade/email-as-user-name

Email as user name