diff --git a/database/migrations/2017_08_14_085334_increase_precision.php b/database/migrations/2017_08_14_085334_increase_precision.php
index d5e3b0801346..717ac1608222 100644
--- a/database/migrations/2017_08_14_085334_increase_precision.php
+++ b/database/migrations/2017_08_14_085334_increase_precision.php
@@ -21,6 +21,11 @@ class IncreasePrecision extends Migration
             $table->decimal('cost', 15, 4)->change();
             $table->decimal('qty', 15, 4)->change();
         });
+
+        Schema::table('clients', function ($table) {
+            $table->integer('credit_number_counter')->default(1)->nullable();
+        });
+
     }
 
     /**
@@ -30,6 +35,8 @@ class IncreasePrecision extends Migration
      */
     public function down()
     {
-        //
+        Schema::table('clients', function ($table) {
+            $table->dropColumn('credit_number_counter');
+        });
     }
 }
diff --git a/database/setup.sql b/database/setup.sql
index 8c2053810822..d22b6eb049d3 100644
--- a/database/setup.sql
+++ b/database/setup.sql
@@ -624,6 +624,7 @@ CREATE TABLE `clients` (
   `invoice_number_counter` int(11) DEFAULT '1',
   `quote_number_counter` int(11) DEFAULT '1',
   `public_notes` text COLLATE utf8_unicode_ci,
+  `credit_number_counter` int(11) DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `clients_account_id_public_id_unique` (`account_id`,`public_id`),
   KEY `clients_user_id_foreign` (`user_id`),
@@ -1231,7 +1232,7 @@ CREATE TABLE `gateways` (
 
 LOCK TABLES `gateways` WRITE;
 /*!40000 ALTER TABLE `gateways` DISABLE KEYS */;
-INSERT INTO `gateways` VALUES (1,'2017-08-16 09:39:53','2017-08-16 09:39:53','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-08-16 09:39:53','2017-08-16 09:39:53','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-08-16 09:39:53','2017-08-16 09:39:53','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-08-16 09:39:53','2017-08-16 09:39:53','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-08-16 09:39:53','2017-08-16 09:39:53','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-08-16 09:39:53','2017-08-16 09:39:53','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-08-16 09:39:53','2017-08-16 09:39:53','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-08-16 09:39:53','2017-08-16 09:39:53','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-08-16 09:39:53','2017-08-16 09:39:53','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-08-16 09:39:53','2017-08-16 09:39:53','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-08-16 09:39:53','2017-08-16 09:39:53','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-08-16 09:39:53','2017-08-16 09:39:53','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-08-16 09:39:53','2017-08-16 09:39:53','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-08-16 09:39:53','2017-08-16 09:39:53','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-08-16 09:39:53','2017-08-16 09:39:53','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-08-16 09:39:54','2017-08-16 09:39:54','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-08-16 09:39:54','2017-08-16 09:39:54','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-08-16 09:39:54','2017-08-16 09:39:54','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-08-16 09:39:54','2017-08-16 09:39:54','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-08-16 09:39:54','2017-08-16 09:39:54','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-08-16 09:39:54','2017-08-16 09:39:54','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-08-16 09:39:54','2017-08-16 09:39:54','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-08-16 09:39:54','2017-08-16 09:39:54','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-08-16 09:39:54','2017-08-16 09:39:54','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-08-16 09:39:54','2017-08-16 09:39:54','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-08-16 09:39:54','2017-08-16 09:39:54','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-08-16 09:39:54','2017-08-16 09:39:54','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-08-16 09:39:54','2017-08-16 09:39:54','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-08-16 09:39:54','2017-08-16 09:39:54','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-08-16 09:39:54','2017-08-16 09:39:54','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-08-16 09:39:54','2017-08-16 09:39:54','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-08-16 09:39:54','2017-08-16 09:39:54','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-08-16 09:39:54','2017-08-16 09:39:54','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-08-16 09:39:54','2017-08-16 09:39:54','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-08-16 09:39:54','2017-08-16 09:39:54','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-08-16 09:39:54','2017-08-16 09:39:54','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-08-16 09:39:54','2017-08-16 09:39:54','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-08-16 09:39:54','2017-08-16 09:39:54','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-08-16 09:39:54','2017-08-16 09:39:54','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-08-16 09:39:54','2017-08-16 09:39:54','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-08-16 09:39:54','2017-08-16 09:39:54','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-08-16 09:39:54','2017-08-16 09:39:54','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-08-16 09:39:54','2017-08-16 09:39:54','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-08-16 09:39:54','2017-08-16 09:39:54','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-08-16 09:39:54','2017-08-16 09:39:54','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-08-16 09:39:54','2017-08-16 09:39:54','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-08-16 09:39:54','2017-08-16 09:39:54','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-08-16 09:39:54','2017-08-16 09:39:54','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-08-16 09:39:54','2017-08-16 09:39:54','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-08-16 09:39:54','2017-08-16 09:39:54','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-08-16 09:39:54','2017-08-16 09:39:54','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-08-16 09:39:54','2017-08-16 09:39:54','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-08-16 09:39:54','2017-08-16 09:39:54','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-08-16 09:39:54','2017-08-16 09:39:54','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-08-16 09:39:54','2017-08-16 09:39:54','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-08-16 09:39:54','2017-08-16 09:39:54','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-08-16 09:39:54','2017-08-16 09:39:54','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-08-16 09:39:54','2017-08-16 09:39:54','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-08-16 09:39:54','2017-08-16 09:39:54','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-08-16 09:39:54','2017-08-16 09:39:54','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-08-16 09:39:54','2017-08-16 09:39:54','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-08-16 09:39:54','2017-08-16 09:39:54','Custom','Custom',1,1,8,0,NULL,1,0),(63,'2017-08-16 09:39:54','2017-08-16 09:39:54','FirstData Payeezy','FirstData_Payeezy',1,1,10000,0,NULL,0,0);
+INSERT INTO `gateways` VALUES (1,'2017-08-17 06:29:17','2017-08-17 06:29:17','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-08-17 06:29:17','2017-08-17 06:29:17','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-08-17 06:29:17','2017-08-17 06:29:17','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-08-17 06:29:17','2017-08-17 06:29:17','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-08-17 06:29:17','2017-08-17 06:29:17','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-08-17 06:29:17','2017-08-17 06:29:17','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-08-17 06:29:17','2017-08-17 06:29:17','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-08-17 06:29:17','2017-08-17 06:29:17','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-08-17 06:29:17','2017-08-17 06:29:17','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-08-17 06:29:17','2017-08-17 06:29:17','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-08-17 06:29:17','2017-08-17 06:29:17','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-08-17 06:29:18','2017-08-17 06:29:18','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-08-17 06:29:18','2017-08-17 06:29:18','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-08-17 06:29:18','2017-08-17 06:29:18','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-08-17 06:29:18','2017-08-17 06:29:18','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-08-17 06:29:18','2017-08-17 06:29:18','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-08-17 06:29:18','2017-08-17 06:29:18','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-08-17 06:29:18','2017-08-17 06:29:18','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-08-17 06:29:18','2017-08-17 06:29:18','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-08-17 06:29:18','2017-08-17 06:29:18','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-08-17 06:29:18','2017-08-17 06:29:18','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-08-17 06:29:18','2017-08-17 06:29:18','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-08-17 06:29:18','2017-08-17 06:29:18','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-08-17 06:29:18','2017-08-17 06:29:18','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-08-17 06:29:18','2017-08-17 06:29:18','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-08-17 06:29:18','2017-08-17 06:29:18','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-08-17 06:29:18','2017-08-17 06:29:18','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-08-17 06:29:18','2017-08-17 06:29:18','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-08-17 06:29:18','2017-08-17 06:29:18','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-08-17 06:29:18','2017-08-17 06:29:18','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-08-17 06:29:18','2017-08-17 06:29:18','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-08-17 06:29:18','2017-08-17 06:29:18','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-08-17 06:29:18','2017-08-17 06:29:18','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-08-17 06:29:18','2017-08-17 06:29:18','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-08-17 06:29:18','2017-08-17 06:29:18','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-08-17 06:29:18','2017-08-17 06:29:18','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-08-17 06:29:18','2017-08-17 06:29:18','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-08-17 06:29:18','2017-08-17 06:29:18','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-08-17 06:29:18','2017-08-17 06:29:18','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-08-17 06:29:18','2017-08-17 06:29:18','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-08-17 06:29:18','2017-08-17 06:29:18','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-08-17 06:29:18','2017-08-17 06:29:18','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-08-17 06:29:18','2017-08-17 06:29:18','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-08-17 06:29:18','2017-08-17 06:29:18','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-08-17 06:29:18','2017-08-17 06:29:18','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-08-17 06:29:18','2017-08-17 06:29:18','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-08-17 06:29:18','2017-08-17 06:29:18','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-08-17 06:29:18','2017-08-17 06:29:18','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-08-17 06:29:18','2017-08-17 06:29:18','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-08-17 06:29:18','2017-08-17 06:29:18','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-08-17 06:29:18','2017-08-17 06:29:18','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-08-17 06:29:18','2017-08-17 06:29:18','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-08-17 06:29:18','2017-08-17 06:29:18','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-08-17 06:29:18','2017-08-17 06:29:18','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-08-17 06:29:18','2017-08-17 06:29:18','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-08-17 06:29:18','2017-08-17 06:29:18','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-08-17 06:29:18','2017-08-17 06:29:18','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-08-17 06:29:18','2017-08-17 06:29:18','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-08-17 06:29:18','2017-08-17 06:29:18','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-08-17 06:29:18','2017-08-17 06:29:18','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-08-17 06:29:18','2017-08-17 06:29:18','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-08-17 06:29:18','2017-08-17 06:29:18','Custom','Custom',1,1,8,0,NULL,1,0),(63,'2017-08-17 06:29:18','2017-08-17 06:29:18','FirstData Payeezy','FirstData_Payeezy',1,1,10000,0,NULL,0,0);
 /*!40000 ALTER TABLE `gateways` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1823,7 +1824,7 @@ CREATE TABLE `payment_libraries` (
 
 LOCK TABLES `payment_libraries` WRITE;
 /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */;
-INSERT INTO `payment_libraries` VALUES (1,'2017-08-16 09:39:52','2017-08-16 09:39:52','Omnipay',1),(2,'2017-08-16 09:39:52','2017-08-16 09:39:52','PHP-Payments [Deprecated]',1);
+INSERT INTO `payment_libraries` VALUES (1,'2017-08-17 06:29:16','2017-08-17 06:29:16','Omnipay',1),(2,'2017-08-17 06:29:16','2017-08-17 06:29:16','PHP-Payments [Deprecated]',1);
 /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1933,7 +1934,7 @@ CREATE TABLE `payment_terms` (
 
 LOCK TABLES `payment_terms` WRITE;
 /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */;
-INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-08-16 09:39:52','2017-08-16 09:39:52',NULL,0,0,1),(2,10,'Net 10','2017-08-16 09:39:52','2017-08-16 09:39:52',NULL,0,0,2),(3,14,'Net 14','2017-08-16 09:39:52','2017-08-16 09:39:52',NULL,0,0,3),(4,15,'Net 15','2017-08-16 09:39:52','2017-08-16 09:39:52',NULL,0,0,4),(5,30,'Net 30','2017-08-16 09:39:52','2017-08-16 09:39:52',NULL,0,0,5),(6,60,'Net 60','2017-08-16 09:39:52','2017-08-16 09:39:52',NULL,0,0,6),(7,90,'Net 90','2017-08-16 09:39:52','2017-08-16 09:39:52',NULL,0,0,7),(8,-1,'Net 0','2017-08-16 09:39:56','2017-08-16 09:39:56',NULL,0,0,0);
+INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,1),(2,10,'Net 10','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,2),(3,14,'Net 14','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,3),(4,15,'Net 15','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,4),(5,30,'Net 30','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,5),(6,60,'Net 60','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,6),(7,90,'Net 90','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,7),(8,-1,'Net 0','2017-08-17 06:29:19','2017-08-17 06:29:19',NULL,0,0,0);
 /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2591,4 +2592,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-08-16 15:39:56
+-- Dump completed on 2017-08-17 12:29:20