Bug 24151: Add boolean flag for has_cardnumber