diff --git a/app/Console/Commands/SendRemindersCron.php b/app/Console/Commands/SendRemindersCron.php
new file mode 100644
index 000000000000..9eaefac5c0f3
--- /dev/null
+++ b/app/Console/Commands/SendRemindersCron.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Console\Commands;
+
+use App\Jobs\Ninja\SendReminders;
+use Illuminate\Console\Command;
+
+class SendRemindersCron extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'ninja:send-reminders';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Force send all reminders';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        SendReminders::dispatchNow();
+    }
+}
diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 5b61b91c241a..f8e007bbcb82 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -33,7 +33,7 @@ class CompanySettings extends BaseSettings
     public $enable_client_portal = true; //@implemented
     public $enable_client_portal_dashboard = true; // @TODO There currently is no dashboard so this is pending
     public $signature_on_pdf = false; //@implemented
-    public $document_email_attachment = false;
+    public $document_email_attachment = false; //@TODO I assume this is 3rd party attachments on the entity to be included
 
     public $portal_design_id = '1'; //?@deprecated
 
@@ -119,16 +119,16 @@ class CompanySettings extends BaseSettings
 
     //public $design = 'views/pdf/design1.blade.php'; //@deprecated - never used
 
-    public $invoice_terms = '';
+    public $invoice_terms = ''; //@implemented
     public $quote_terms = ''; //@implemented
     public $invoice_taxes = 0; // ? used in AP only?
     // public $enabled_item_tax_rates = 0;
     public $invoice_design_id = 'VolejRejNm'; //@implemented
     public $quote_design_id = 'VolejRejNm'; //@implemented
     public $credit_design_id = 'VolejRejNm'; //@implemented
-    public $invoice_footer = '';
-    public $credit_footer = '';
-    public $credit_terms = '';
+    public $invoice_footer = ''; //@implemented
+    public $credit_footer = ''; //@implemented
+    public $credit_terms = ''; //@implemented
     public $invoice_labels = ''; //@TODO used in AP only?
     public $tax_name1 = ''; //@TODO where do we use this?
     public $tax_rate1 = 0; //@TODO where do we use this?
diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index 3a6898e92902..f284e550424c 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -16,7 +16,6 @@ use App\Http\Requests\Credit\ShowCreditRequest;
 use App\Http\Requests\Credit\StoreCreditRequest;
 use App\Http\Requests\Credit\UpdateCreditRequest;
 use App\Http\Requests\Invoice\EditInvoiceRequest;
-use App\Jobs\Credit\StoreCredit;
 use App\Jobs\Entity\EmailEntity;
 use App\Jobs\Invoice\EmailCredit;
 use App\Jobs\Invoice\MarkInvoicePaid;
@@ -188,7 +187,9 @@ class CreditController extends BaseController
 
         $credit = $this->credit_repository->save($request->all(), CreditFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
-        $credit = StoreCredit::dispatchNow($credit, $request->all(), $credit->company);
+        $credit = $credit->service()        
+                         ->fillDefaults()
+                         ->save();
 
         event(new CreditWasCreated($credit, $credit->company, Ninja::eventVars()));
 
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index bcd61c1439c3..fb0350e5fe3f 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -213,7 +213,10 @@ class InvoiceController extends BaseController
 
         event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars()));
 
-        $invoice = $invoice->service()->triggeredActions($request)->save();
+        $invoice = $invoice->service()
+                           ->fillDefaults()
+                           ->triggeredActions($request)
+                           ->save();
 
         return $this->itemResponse($invoice);
     }
diff --git a/app/Jobs/Credit/StoreCredit.php b/app/Jobs/Credit/StoreCredit.php
deleted file mode 100644
index 0a114fab9d2d..000000000000
--- a/app/Jobs/Credit/StoreCredit.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Jobs\Credit;
-
-use App\Jobs\Payment\PaymentNotification;
-use App\Libraries\MultiDB;
-use App\Models\Company;
-use App\Models\Credit;
-use App\Repositories\CreditRepository;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class StoreCredit implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $credit;
-
-    protected $data;
-
-    /**
-     * Create a new job instance.
-     *
-     * @param Credit $credit
-     * @param array $data
-     */
-    public function __construct(Credit $credit, array $data)
-    {
-        $this->credit = $credit;
-
-        $this->data = $data;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @param CreditRepository $credit_repository
-     * @return Credit|null
-     */
-    public function handle(CreditRepository $credit_repository): ?Credit
-    {
-        // MultiDB::setDB($this->company->db);
-
-        // $payment = false;
-
-        // if ($payment) {
-        //     PaymentNotification::dispatch($payment, $payment->company);
-        // }
-
-        return $this->credit;
-    }
-}
diff --git a/app/Jobs/Ninja/SendReminders.php b/app/Jobs/Ninja/SendReminders.php
new file mode 100644
index 000000000000..fd26d397ba78
--- /dev/null
+++ b/app/Jobs/Ninja/SendReminders.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Jobs\Ninja;
+
+use App\Libraries\MultiDB;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class SendReminders implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+
+        info("Sending reminders ".Carbon::now()->format('Y-m-d h:i:s'));
+
+        if (! config('ninja.db.multi_db_enabled')) {
+
+
+
+        } else {
+            //multiDB environment, need to
+            foreach (MultiDB::$dbs as $db) {
+
+                MultiDB::setDB($db);
+
+            }
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php
index b31e15043909..4928b4d45178 100644
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@@ -104,6 +104,17 @@ class CreditService
 
     public function fillDefaults()
     {
+        $settings = $this->credit->client->getMergedSettings();
+
+        if(! $this->credit->design_id) 
+            $this->credit->design_id = $this->decodePrimaryKey($settings->credit_design_id);
+            
+        if(!isset($this->credit->footer))
+            $this->credit->footer = $settings->credit_footer;
+
+        if(!isset($this->credit->terms))
+            $this->credit->terms = $settings->credit_terms;
+
         
         return $this;        
     }
diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php
index 878d766075e7..102f1bee251b 100644
--- a/app/Services/Invoice/AutoBillInvoice.php
+++ b/app/Services/Invoice/AutoBillInvoice.php
@@ -60,8 +60,8 @@ class AutoBillInvoice extends AbstractService
         if($this->client->getSetting('use_credits_payment') != 'off')
             $this->applyCreditPayment();
 
-        info("partial = {$this->invoice->partial}");
-        info("balance = {$this->invoice->balance}");
+        // info("partial = {$this->invoice->partial}");
+        // info("balance = {$this->invoice->balance}");
 
         /* Determine $amount */
         if ($this->invoice->partial > 0)
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index d0d4d4efe1ac..5171752aea9e 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -365,6 +365,17 @@ class InvoiceService
 
     public function fillDefaults()
     {
+        $settings = $this->invoice->client->getMergedSettings();
+
+        if(! $this->invoice->design_id) 
+            $this->invoice->design_id = $this->decodePrimaryKey($settings->invoice_design_id);
+            
+        if(!isset($this->invoice->footer))
+            $this->invoice->footer = $settings->invoice_footer;
+
+        if(!isset($this->invoice->terms))
+            $this->invoice->terms = $settings->invoice_terms;
+
         
         return $this;        
     }