User should be able to change password
Merge branch 'user-reset-password'