login fields to email_fields
Merge branch 'master' of heroku.com:boilermake-staging