#635 - Fix exceptions for reset password