add email auth
Merge branch 't6_email_auth'