Chris-16

This fixes an issue where validation occurs in the wrong order and cannot validate an Amex card after a restore.