diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php
index 70e249f58015..96ed926e734d 100644
--- a/app/Jobs/RecurringInvoice/SendRecurring.php
+++ b/app/Jobs/RecurringInvoice/SendRecurring.php
@@ -86,14 +86,14 @@ class SendRecurring implements ShouldQueue
         $this->recurring_invoice->save();
         
         //Admin notification for recurring invoice sent. 
-        if ($invoice->invitations->count() >= 1) {
+        if ($invoice->invitations->count() >= 1 ) {
             $invoice->entityEmailEvent($invoice->invitations->first(), 'invoice', 'email_template_invoice');
         }
     
         nlog("Invoice {$invoice->number} created");
 
         $invoice->invitations->each(function ($invitation) use ($invoice) {
-            if ($invitation->contact && strlen($invitation->contact->email) >=1) {
+            if ($invitation->contact && strlen($invitation->contact->email) >=1 && $invoice->client->getSetting('auto_email_invoice')) {
 
                 try{
                     EmailEntity::dispatch($invitation, $invoice->company);
diff --git a/app/Services/User/UserService.php b/app/Services/User/UserService.php
index 5b44632420c1..bcecad59ac48 100644
--- a/app/Services/User/UserService.php
+++ b/app/Services/User/UserService.php
@@ -39,7 +39,7 @@ class UserService
             $nmo->to_user = $this->user;
             $nmo->settings = $company->settings;
 
-            NinjaMailerJob::dispatch($nmo);
+            NinjaMailerJob::dispatch($nmo, true);
 
             Ninja::registerNinjaUser($this->user);