US333: improved resilience / messaging around password reset failure scenarios