Merge pull request #189 from stef145g/develop

Make Credit Card functionality same as other account types.