fix intermittent error using new password change functionality, RT#22059