More fixes for reset password