Improved default credit card fields. #911