Change "email" to "username" on login form
Merge branch 'update_login_form'