diff --git a/app/Factory/CloneQuoteToInvoiceFactory.php b/app/Factory/CloneQuoteToInvoiceFactory.php
index 0c17ed9de216..086b6db742c5 100644
--- a/app/Factory/CloneQuoteToInvoiceFactory.php
+++ b/app/Factory/CloneQuoteToInvoiceFactory.php
@@ -28,9 +28,9 @@ class CloneQuoteToInvoiceFactory
         unset($quote_array['invoice_id']);
         unset($quote_array['id']);
         unset($quote_array['invitations']);
-        //unset($quote_array['terms']);
-        //unset($quote_array['public_notes']);
-        //unset($quote_array['footer']);
+        unset($quote_array['terms']);
+        unset($quote_array['public_notes']);
+        unset($quote_array['footer']);
         unset($quote_array['design_id']);
 
         foreach ($quote_array as $key => $value) {
diff --git a/app/Http/Controllers/DesignController.php b/app/Http/Controllers/DesignController.php
index 5bd721cd6ef0..c6f44abf250a 100644
--- a/app/Http/Controllers/DesignController.php
+++ b/app/Http/Controllers/DesignController.php
@@ -491,7 +491,7 @@ class DesignController extends BaseController
 
     public function default(DefaultDesignRequest $request)
     {
-        $design_id = $request->int('design_id');
+        $design_id = $request->input('design_id');
         $entity = $request->input('entity');
         $company = auth()->user()->getCompany();
 
diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 8954722e7796..1597a73a1162 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -257,7 +257,9 @@ class NinjaMailerJob implements ShouldQueue
         if(Ninja::isHosted() && $this->company->account->emailQuotaExceeded())
             return true;
 
-
+        if(!str_contains($this->nmo->to_user->email, "@"))
+            return true;
+        
         return false;
     }