Make Credit Card functionality same as other account types.