diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php
index f56fbca5dfb2..168c6f092aa2 100644
--- a/resources/views/portal/ninja2020/invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show.blade.php
@@ -12,7 +12,11 @@
 
 @section('body')
 
-    @if(!$invoice->isPayable() && $client->getSetting('custom_message_paid_invoice'))
+    @if($invoice->isPayable() && $client->getSetting('custom_message_unpaid_invoice'))
+        @component('portal.ninja2020.components.message')
+            {{ $client->getSetting('custom_message_unpaid_invoice') }}
+        @endcomponent
+    @elseif($invoice->status_id === 4 && $client->getSetting('custom_message_paid_invoice'))
         @component('portal.ninja2020.components.message')
             {{ $client->getSetting('custom_message_paid_invoice') }}
         @endcomponent
diff --git a/resources/views/portal/ninja2020/quotes/show.blade.php b/resources/views/portal/ninja2020/quotes/show.blade.php
index 0a550b53b1fb..71dfa0553fdd 100644
--- a/resources/views/portal/ninja2020/quotes/show.blade.php
+++ b/resources/views/portal/ninja2020/quotes/show.blade.php
@@ -15,9 +15,9 @@
 
 @section('body')
 
-    @if(!$quote->isApproved() && $client->getSetting('custom_message_unpaid_invoice'))
+    @if(!$quote->isApproved() && $client->getSetting('custom_message_unapproved_quote'))
         @component('portal.ninja2020.components.message')
-            {{ $client->getSetting('custom_message_unpaid_invoice') }}
+            {{ $client->getSetting('custom_message_unapproved_quote') }}
         @endcomponent
     @endif