Check moar fields for CC numbers

Because people add them here too

Change-Id: I6efbda38405123897782bbc07669b5de08b95f01
Merge "Check moar fields for CC numbers"