Add email login
Refactor user login
Merge branch 'zeema-user'