Set missing credit card attributes when possible. Fixes #4972