Allow auth with e-mail or login
Merge pull request #529 from franckstauffer/i18n

Allow auth with e-mail or login