Add email as valid login
Merge pull request #142 from Orasi/staging-two

Add email as valid login