diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index 97e57262112d..99a0c1a39bcb 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -65,6 +65,9 @@ class InvitationController extends Controller
     private function genericRouter(string $entity, string $invitation_key)
     {
 
+        if(!in_array($entity, ['invoice', 'credit', 'quote', 'recurring_invoice']))
+            return response()->json(['message' => 'Invalid resource request']);
+
         $key = $entity.'_id';
 
         $entity_obj = 'App\Models\\'.ucfirst(Str::camel($entity)).'Invitation';
@@ -133,6 +136,9 @@ class InvitationController extends Controller
     private function returnRawPdf(string $entity, string $invitation_key)
     {
 
+        if(!in_array($entity, ['invoice', 'credit', 'quote', 'recurring_invoice']))
+            return response()->json(['message' => 'Invalid resource request']);
+
         $key = $entity.'_id';
 
         $entity_obj = 'App\Models\\'.ucfirst(Str::camel($entity)).'Invitation';
diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index bedd150153d3..faeda280f0b4 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -127,7 +127,7 @@ class EmailController extends BaseController
 
         $entity_obj->invitations->each(function ($invitation) use ($data, $entity_string, $entity_obj, $template) {
 
-            if (!$invitation->contact->trashed() && $invitation->contact->send_email && $invitation->contact->email) {
+            if (!$invitation->contact->trashed() && $invitation->contact->email) {
                 
                 $entity_obj->service()->markSent()->save();
 
diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php
index df7d0dcc40bb..878db0fd8b2c 100644
--- a/app/Jobs/RecurringInvoice/SendRecurring.php
+++ b/app/Jobs/RecurringInvoice/SendRecurring.php
@@ -59,15 +59,15 @@ class SendRecurring implements ShouldQueue
     public function handle() : void
     {
         //reset all contacts here
-        $this->recurring_invoice->client->contacts()->update(['send_email' => false]);
+        // $this->recurring_invoice->client->contacts()->update(['send_email' => false]);
 
-        $this->recurring_invoice->invitations->each(function ($invitation){
+        // $this->recurring_invoice->invitations->each(function ($invitation){
 
-            $contact = $invitation->contact;
-            $contact->send_email = true;
-            $contact->save();
+        //     $contact = $invitation->contact;
+        //     $contact->send_email = true;
+        //     $contact->save();
             
-        });
+        // });
 
         // Generate Standard Invoice
         $invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice, $this->recurring_invoice->client);
@@ -153,7 +153,7 @@ class SendRecurring implements ShouldQueue
         }
 
         //important catch all here - we should never leave contacts send_email to false incase they are permanently set to false in the future.
-        $this->recurring_invoice->client->contacts()->update(['send_email' => true]);
+        // $this->recurring_invoice->client->contacts()->update(['send_email' => true]);
 
     }
 
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index eed36b9ff967..2c7141c71c46 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -395,7 +395,7 @@ class BaseDriver extends AbstractPaymentDriver
 
             $invoices->first()->invitations->each(function ($invitation) use ($nmo) {
 
-                if ($invitation->contact->send_email && $invitation->contact->email) {
+                if ($invitation->contact->email) {
 
                     $nmo->to_user = $invitation->contact;
                     NinjaMailerJob::dispatch($nmo);
@@ -459,7 +459,7 @@ class BaseDriver extends AbstractPaymentDriver
 
         $invoices->first()->invitations->each(function ($invitation) use ($nmo){
 
-            if (!$invitation->contact->trashed() && $invitation->contact->send_email && $invitation->contact->email) {
+            if (!$invitation->contact->trashed() && $invitation->contact->email) {
 
                 $nmo->to_user = $invitation->contact;
                 NinjaMailerJob::dispatch($nmo);
diff --git a/app/Services/Credit/SendEmail.php b/app/Services/Credit/SendEmail.php
index 55599323f139..03e4d9b7b127 100644
--- a/app/Services/Credit/SendEmail.php
+++ b/app/Services/Credit/SendEmail.php
@@ -44,7 +44,7 @@ class SendEmail
         }
 
         $this->credit->invitations->each(function ($invitation) {
-            if (!$invitation->contact->trashed() && $invitation->contact->send_email && $invitation->contact->email) {
+            if (!$invitation->contact->trashed() && $invitation->contact->email) {
                 $email_builder = (new CreditEmail())->build($invitation, $this->reminder_template);
 
                 // EmailCredit::dispatchNow($email_builder, $invitation, $invitation->company);
diff --git a/app/Services/Invoice/SendEmail.php b/app/Services/Invoice/SendEmail.php
index f96b95cbaabc..3b0fc8bbdd98 100644
--- a/app/Services/Invoice/SendEmail.php
+++ b/app/Services/Invoice/SendEmail.php
@@ -44,7 +44,7 @@ class SendEmail extends AbstractService
         }
 
         $this->invoice->invitations->each(function ($invitation) {
-            if (!$invitation->contact->trashed() && $invitation->contact->send_email && $invitation->contact->email) {
+            if (!$invitation->contact->trashed() && $invitation->contact->email) {
                 EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template);
             }
         });
diff --git a/app/Services/Payment/SendEmail.php b/app/Services/Payment/SendEmail.php
index 99f1ae45664c..19702b631738 100644
--- a/app/Services/Payment/SendEmail.php
+++ b/app/Services/Payment/SendEmail.php
@@ -33,7 +33,7 @@ class SendEmail
     public function run()
     {
         $this->payment->client->contacts->each(function ($contact) {
-            if ($contact->send_email && $contact->email) {
+            if ($contact->email) {
                 EmailPayment::dispatchNow($this->payment, $this->payment->company, $contact);
             }
         });
diff --git a/app/Services/Quote/SendEmail.php b/app/Services/Quote/SendEmail.php
index 8fb1c30024a0..7903f9b28b24 100644
--- a/app/Services/Quote/SendEmail.php
+++ b/app/Services/Quote/SendEmail.php
@@ -42,7 +42,7 @@ class SendEmail
         }
 
         $this->quote->invitations->each(function ($invitation) {
-            if (!$invitation->contact->trashed() && $invitation->contact->send_email && $invitation->contact->email) {
+            if (!$invitation->contact->trashed() && $invitation->contact->email) {
                 EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template);
             }
         });