diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 938b69ed3fb3..716d0deb2c59 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -255,7 +255,7 @@ class BaseController extends Controller
                   $query->where('expenses.user_id', $user->id)->orWhere('expenses.assigned_user_id', $user->id);
             },
             'company.groups' => function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('documents');
+                $query->whereNotNull('updated_at')->with('documents');
 
                 // if(!$user->isAdmin())
                 //   $query->where('group_settings.user_id', $user->id);
@@ -275,7 +275,7 @@ class BaseController extends Controller
 
             },
             'company.payment_terms'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at);
+                $query->whereNotNull('updated_at');
 
                 if(!$user->isAdmin())
                   $query->where('payment_terms.user_id', $user->id);
@@ -346,7 +346,6 @@ class BaseController extends Controller
 
             },
             'company.subscriptions'=> function ($query) use($updated_at, $user) {
-              // $query->where('updated_at', '>=', $updated_at);
                 $query->whereNotNull('updated_at');
 
               if(!$user->isAdmin())
diff --git a/app/Mail/Engine/CreditEmailEngine.php b/app/Mail/Engine/CreditEmailEngine.php
index 68bd72ebbc22..ad9645b6c8f7 100644
--- a/app/Mail/Engine/CreditEmailEngine.php
+++ b/app/Mail/Engine/CreditEmailEngine.php
@@ -69,6 +69,9 @@ class CreditEmailEngine extends BaseEmailEngine
                 null,
                 $this->client->locale()
             );
+
+            $body_template .= '<div class="center">$view_button</div>';
+
         }
 
         if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php
index afe907d348b6..dad4b78f0f02 100644
--- a/app/Mail/Engine/InvoiceEmailEngine.php
+++ b/app/Mail/Engine/InvoiceEmailEngine.php
@@ -74,6 +74,9 @@ class InvoiceEmailEngine extends BaseEmailEngine
                 null,
                 $this->client->locale()
             );
+
+            $body_template .= '<div class="center">$view_button</div>';
+
         }
 
         if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
diff --git a/app/Mail/Engine/QuoteEmailEngine.php b/app/Mail/Engine/QuoteEmailEngine.php
index 39342f8f60fc..98c4b394c400 100644
--- a/app/Mail/Engine/QuoteEmailEngine.php
+++ b/app/Mail/Engine/QuoteEmailEngine.php
@@ -44,6 +44,7 @@ class QuoteEmailEngine extends BaseEmailEngine
 
     public function build()
     {
+
         App::forgetInstance('translator');
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->client->getMergedSettings()));
@@ -56,9 +57,10 @@ class QuoteEmailEngine extends BaseEmailEngine
         } else {
             $body_template = $this->client->getSetting('email_template_'.$this->reminder_template);
         }
-        
+
         /* Use default translations if a custom message has not been set*/
         if (iconv_strlen($body_template) == 0) {
+
             $body_template = trans(
                 'texts.quote_message',
                 [
@@ -69,8 +71,11 @@ class QuoteEmailEngine extends BaseEmailEngine
                 null,
                 $this->client->locale()
             );
+
+            $body_template .= '<div class="center">$view_button</div>';
         }
 
+
         if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
             $subject_template = $this->template_data['subject'];
         } else {
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index 4f8e221b0634..2e7e589e9325 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -52,7 +52,8 @@ class TemplateEmail extends Mailable
 
     public function build()
     {
-         $template_name = 'email.template.'.$this->build_email->getTemplate();
+        
+        $template_name = 'email.template.'.$this->build_email->getTemplate();
 
         if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') {
             $template_name = 'email.template.client';
diff --git a/app/Services/Quote/TriggeredActions.php b/app/Services/Quote/TriggeredActions.php
index 14d69b63fe8e..fa630d753fe6 100644
--- a/app/Services/Quote/TriggeredActions.php
+++ b/app/Services/Quote/TriggeredActions.php
@@ -59,9 +59,6 @@ class TriggeredActions extends AbstractService
         $reminder_template = $this->quote->calculateTemplate('quote');
         // $reminder_template = 'email_template_quote';
 
-// nlog($reminder_template);
-
-
         $this->quote->invitations->load('contact.client.country', 'quote.client.country', 'quote.company')->each(function ($invitation) use ($reminder_template) {
             EmailEntity::dispatch($invitation, $this->quote->company, $reminder_template);
         });