diff --git a/app/Services/TemplateService.php b/app/Services/TemplateService.php
index fe20a55c4a39..75f3373b596f 100644
--- a/app/Services/TemplateService.php
+++ b/app/Services/TemplateService.php
@@ -58,10 +58,10 @@ class TemplateService
             '$viewButton' => Form::emailViewButton($invitation->getLink(), $invoice->getEntityType()).'$password',
             '$paymentLink' => $invitation->getLink('payment').'$password',
             '$paymentButton' => Form::emailPaymentButton($invitation->getLink('payment')).'$password',
-            '$customClient1' => $account->custom_client_label1,
-            '$customClient2' => $account->custom_client_label2,
-            '$customInvoice1' => $account->custom_invoice_text_label1,
-            '$customInvoice2' => $account->custom_invoice_text_label2,
+            '$customClient1' => $client->custom_value1,
+            '$customClient2' => $client->custom_value2,
+            '$customInvoice1' => $invoice->custom_text_value1,
+            '$customInvoice2' => $invoice->custom_text_value2,
             '$documents' => $documentsHTML,
             '$autoBill' => empty($data['autobill'])?'':$data['autobill'],
             '$portalLink' => $invitation->contact->link,
diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php
index 55d369233a92..cb0b0534d20e 100644
--- a/resources/views/accounts/templates_and_reminders.blade.php
+++ b/resources/views/accounts/templates_and_reminders.blade.php
@@ -148,7 +148,7 @@
                             <li>$customInvoice1</li>
                         @endif
                         @if ($account->custom_invoice_text_label2)
-                            <li>$customInvoice1</li>
+                            <li>$customInvoice2</li>
                         @endif
                         @if (count($account->account_gateways) > 0)
                             @foreach (\App\Models\Gateway::$gatewayTypes as $type)