Issues 843 844 confirm reset password error

The second commit (d172b8d) is only for testing.