diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 12c1f4da60ca..4efc296a13e5 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -58,9 +58,9 @@ class CompanySettings extends BaseSettings
     public $send_reminders = false; //@TODO
 
     public $custom_message_dashboard = ''; // @TODO There currently is no dashboard so this is pending
-    public $custom_message_unpaid_invoice = '';  //@ben to implement
-    public $custom_message_paid_invoice = '';  //@ben to implement
-    public $custom_message_unapproved_quote = '';  //@ben to implement
+    public $custom_message_unpaid_invoice = '';
+    public $custom_message_paid_invoice = '';
+    public $custom_message_unapproved_quote = '';
     public $auto_archive_quote = false; //@implemented
     public $auto_convert_quote = true; //@implemented
     public $auto_email_invoice = true; //@only used for Recurring Invoices, if set to false, we never send?
diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php
index 01d77a43b7de..d00556bdc854 100644
--- a/resources/views/portal/ninja2020/invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show.blade.php
@@ -8,21 +8,15 @@
 
 @section('body')
 
-    @if($invoice->isPayable() && !empty($client->getSetting('custom_message_unpaid_invoice')))
+    @if(!$invoice->isApproved() && $client->getSetting('custom_message_unapproved_quote'))
         @component('portal.ninja2020.components.message')
-            {!! CustomMessage::client($client)
-                ->company($client->company)
-                ->entity($invoice)
-                ->message($client->getSetting('custom_message_unpaid_invoice')) !!}
+            {{ $client->getSetting('custom_message_unapproved_quote') }}
         @endcomponent
     @endif
 
-    @if(!$invoice->isPayable() && !empty($client->getSetting('custom_message_paid_invoice')))
+    @if(!$invoice->isPayable() && $client->getSetting('custom_message_paid_invoice'))
         @component('portal.ninja2020.components.message')
-            {!! CustomMessage::client($client)
-                ->company($client->company)
-                ->entity($invoice)
-                ->message($client->getSetting('custom_message_paid_invoice')) !!}
+            {{ $client->getSetting('custom_message_paid_invoice') }}
         @endcomponent
     @endif
 
diff --git a/resources/views/portal/ninja2020/quotes/show.blade.php b/resources/views/portal/ninja2020/quotes/show.blade.php
index 039a325f1420..e0705c981b40 100644
--- a/resources/views/portal/ninja2020/quotes/show.blade.php
+++ b/resources/views/portal/ninja2020/quotes/show.blade.php
@@ -8,12 +8,9 @@
 
 @section('body')
 
-    @if(!$quote->isApproved() && !empty($client->getSetting('custom_message_unapproved_quote')))
+    @if(!$quote->isApproved() && $client->getSetting('custom_message_unpaid_invoice'))
         @component('portal.ninja2020.components.message')
-            {!! CustomMessage::client($client)
-                ->company($client->company)
-                ->entity($quote)
-                ->message($client->getSetting('custom_message_unapproved_quote')) !!}
+            {{ $client->getSetting('custom_message_unpaid_invoice') }}
         @endcomponent
     @endif