Ensure reverify before PIN reset (bug 836060)