Add password reset
Merge feature/password-reset