diff --git a/app/Helpers/Email/InvoiceEmail.php b/app/Helpers/Email/InvoiceEmail.php
index adac32f6682f..49c7630bbe06 100644
--- a/app/Helpers/Email/InvoiceEmail.php
+++ b/app/Helpers/Email/InvoiceEmail.php
@@ -45,9 +45,9 @@ class InvoiceEmail extends EmailBuilder
         if (iconv_strlen($subject_template) == 0) {
             if ($reminder_template == 'quote') {
                 $subject_template = trans(
-                    'texts.invoice_subject',
+                    'texts.quote_subject',
                     [
-                        'invoice' => $invoice->present()->invoice_number(),
+                        'number' => $invoice->number,
                         'account' => $invoice->company->present()->name()
                     ],
                     null,
@@ -55,9 +55,9 @@ class InvoiceEmail extends EmailBuilder
                 );
             } else {
                 $subject_template = trans(
-                    'texts.reminder_subject',
+                    'texts.invoice_subject',
                     [
-                        'invoice' => $invoice->present()->invoice_number(),
+                        'number' => $invoice->number,
                         'account' => $invoice->company->present()->name()
                     ],
                     null,
diff --git a/app/Services/Invoice/TriggeredActions.php b/app/Services/Invoice/TriggeredActions.php
index 1610c08898b9..8b807031e825 100644
--- a/app/Services/Invoice/TriggeredActions.php
+++ b/app/Services/Invoice/TriggeredActions.php
@@ -62,7 +62,8 @@ class TriggeredActions extends AbstractService
     private function sendEmail()
     {
 
-        $reminder_template = $this->invoice->calculateTemplate();
+        //$reminder_template = $this->invoice->calculateTemplate();
+        $reminder_template = 'payment';
 
         $this->invoice->invitations->load('contact.client.country','invoice.client.country','invoice.company')->each(function ($invitation) use($reminder_template){
 
diff --git a/app/Utils/Traits/MakesReminders.php b/app/Utils/Traits/MakesReminders.php
index 4dbab806e75b..1da4e1c8de5c 100644
--- a/app/Utils/Traits/MakesReminders.php
+++ b/app/Utils/Traits/MakesReminders.php
@@ -189,9 +189,7 @@ trait MakesReminders
         $client = $this->client;
 
         //if the invoice
-        if($this->balance == 0){
-            return 'invoice';
-        }elseif ($client->getSetting('enable_reminder1') !== false && $this->inReminderWindow(
+        if ($client->getSetting('enable_reminder1') !== false && $this->inReminderWindow(
             $client->getSetting('schedule_reminder1'),
             $client->getSetting('num_days_reminder1')
         )) {