#167: Reduce CPU cost of password check/migration