Add password reset
Merge branch 'password-reset'