diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
index e04a672c46d5..3e290847fed3 100644
--- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
@@ -12,6 +12,7 @@
 namespace App\Http\Requests\RecurringInvoice;
 
 use App\Http\Requests\Request;
+use App\Models\Client;
 use App\Models\RecurringInvoice;
 use App\Utils\Traits\CleanLineItems;
 use App\Utils\Traits\MakesHash;
@@ -98,7 +99,11 @@ class StoreRecurringInvoiceRequest extends Request
         
     if(isset($input['auto_bill']))
         $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
-
+    else{
+        $client = Client::find($this->decodePrimaryKey($input['client_id']));
+        $input['auto_bill'] = $client->getSetting('auto_bill');
+    }
+    
     $this->replace($input);
 }
 
diff --git a/app/Listeners/SendVerificationNotification.php b/app/Listeners/SendVerificationNotification.php
index b8205f7b7139..1ff54ed022b7 100644
--- a/app/Listeners/SendVerificationNotification.php
+++ b/app/Listeners/SendVerificationNotification.php
@@ -47,7 +47,7 @@ class SendVerificationNotification implements ShouldQueue
         MultiDB::setDB($event->company->db);
 
         try {
-            $event->user->notify(new VerifyUser($event->user));
+            $event->user->notify(new VerifyUser($event->user, $event->company));
 
             Ninja::registerNinjaUser($event->user);
 
diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index 0750e614f262..80ca04894b46 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -200,6 +200,11 @@ class RecurringInvoice extends BaseModel
 
     public function nextSendDate() :?Carbon
     {
+        if(!$this->next_send_date){
+            return null;
+            // $this->next_send_date = now()->format('Y-m-d');
+        }
+
         switch ($this->frequency_id) {
             case self::FREQUENCY_WEEKLY:
                 return Carbon::parse($this->next_send_date)->addWeek();
diff --git a/app/Notifications/Admin/EntitySentNotification.php b/app/Notifications/Admin/EntitySentNotification.php
index dead3b4eae8f..eb649440434d 100644
--- a/app/Notifications/Admin/EntitySentNotification.php
+++ b/app/Notifications/Admin/EntitySentNotification.php
@@ -101,6 +101,7 @@ class EntitySentNotification extends Notification implements ShouldQueue
             'button' => ctrans("texts.view_{$this->entity_name}"),
             'signature' => $this->settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->settings,
         ];
 
         return (new MailMessage)
diff --git a/app/Notifications/Admin/EntityViewedNotification.php b/app/Notifications/Admin/EntityViewedNotification.php
index d482d6d38989..13adb05d9201 100644
--- a/app/Notifications/Admin/EntityViewedNotification.php
+++ b/app/Notifications/Admin/EntityViewedNotification.php
@@ -146,6 +146,8 @@ class EntityViewedNotification extends Notification implements ShouldQueue
             'button' => ctrans("texts.view_{$this->entity_name}"),
             'signature' => $this->settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->settings,
+
         ];
 
         return $data;
diff --git a/app/Notifications/Admin/InvoiceSentNotification.php b/app/Notifications/Admin/InvoiceSentNotification.php
index 38c208f0a959..88cfe260768a 100644
--- a/app/Notifications/Admin/InvoiceSentNotification.php
+++ b/app/Notifications/Admin/InvoiceSentNotification.php
@@ -96,6 +96,8 @@ class InvoiceSentNotification extends Notification implements ShouldQueue
             'button' => ctrans('texts.view_invoice'),
             'signature' => $this->settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->settings,
+
         ];
 
         return (new MailMessage)
diff --git a/app/Notifications/Admin/InvoiceViewedNotification.php b/app/Notifications/Admin/InvoiceViewedNotification.php
index 9d468ea1d186..55e956ca441a 100644
--- a/app/Notifications/Admin/InvoiceViewedNotification.php
+++ b/app/Notifications/Admin/InvoiceViewedNotification.php
@@ -96,6 +96,8 @@ class InvoiceViewedNotification extends Notification implements ShouldQueue
             'button' => ctrans('texts.view_invoice'),
             'signature' => $this->settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->settings,
+
         ];
 
         return (new MailMessage)
diff --git a/app/Notifications/Admin/NewPartialPaymentNotification.php b/app/Notifications/Admin/NewPartialPaymentNotification.php
index acbaf9f402ef..55e0eef18189 100644
--- a/app/Notifications/Admin/NewPartialPaymentNotification.php
+++ b/app/Notifications/Admin/NewPartialPaymentNotification.php
@@ -94,6 +94,7 @@ class NewPartialPaymentNotification extends Notification implements ShouldQueue
             'button' => ctrans('texts.view_payment'),
             'signature' => $this->settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->settings,
         ];
 
         return (new MailMessage)
diff --git a/app/Notifications/Admin/NewPaymentNotification.php b/app/Notifications/Admin/NewPaymentNotification.php
index d24267c1d519..5dab2f612e45 100644
--- a/app/Notifications/Admin/NewPaymentNotification.php
+++ b/app/Notifications/Admin/NewPaymentNotification.php
@@ -97,6 +97,7 @@ class NewPaymentNotification extends Notification implements ShouldQueue
             'button' => ctrans('texts.view_payment'),
             'signature' => $this->settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->settings,
         ];
 
         return (new MailMessage)
diff --git a/app/Notifications/NewAccountCreated.php b/app/Notifications/NewAccountCreated.php
index f4d6ef5b4490..81f6230f20a3 100644
--- a/app/Notifications/NewAccountCreated.php
+++ b/app/Notifications/NewAccountCreated.php
@@ -73,6 +73,7 @@ class NewAccountCreated extends Notification implements ShouldQueue
             'button' => ctrans('texts.account_login'),
             'signature' => $this->company->settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->company->settings, 
         ];
 
         return (new MailMessage)
diff --git a/app/Notifications/Ninja/NewAccountCreated.php b/app/Notifications/Ninja/NewAccountCreated.php
index 580c0da32d98..13d586ec21d1 100644
--- a/app/Notifications/Ninja/NewAccountCreated.php
+++ b/app/Notifications/Ninja/NewAccountCreated.php
@@ -73,6 +73,7 @@ class NewAccountCreated extends Notification implements ShouldQueue
             'button' => ctrans('texts.account_login'),
             'signature' => $this->company->settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->company->settings,
         ];
 
         return (new MailMessage)
diff --git a/app/Notifications/Ninja/VerifyUser.php b/app/Notifications/Ninja/VerifyUser.php
index bef51b3e5009..74712d0697b5 100644
--- a/app/Notifications/Ninja/VerifyUser.php
+++ b/app/Notifications/Ninja/VerifyUser.php
@@ -32,9 +32,12 @@ class VerifyUser extends Notification implements ShouldQueue
      */
     protected $user;
 
-    public function __construct($user)
+    private $company;
+
+    public function __construct($user, $company)
     {
         $this->user = $user;
+        $this->company = $company;
     }
 
     /**
@@ -63,6 +66,7 @@ class VerifyUser extends Notification implements ShouldQueue
             'button' => ctrans('texts.button_confirmation_message'),
             'signature' => '',
             'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png',
+            'settings' => $this->company->settings,
         ];
 
         return (new MailMessage)