issue #23982: correctly prepopulate some credit card data