Make confirm PIN more sticky (bug 872299)