fix for bug 29135 - please carefully review as it touched the PasswordReset behaviour...