Make login work with email
Change error message names
Merge pull request #150 from krazemon/email

Make login work with email