diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index 2755ae7199..a22ca204ed 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -483,6 +483,7 @@ class ClientPortalController extends BaseController
         return response()->view('error', [
             'error' => $error ?: trans('texts.invoice_not_found'),
             'hideHeader' => true,
+            'account' => $this->getContact()->account,
         ]);
     }
 
diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php
index 24d652b6b6..724954b50d 100644
--- a/resources/views/public/header.blade.php
+++ b/resources/views/public/header.blade.php
@@ -84,7 +84,7 @@
             <div id="navbar" class="collapse navbar-collapse">
                 @if (!isset($account) || $account->isNinjaAccount() || $account->enable_client_portal)
                 <ul class="nav navbar-nav navbar-right">
-                    @if (!isset($account) || $account->enable_client_portal_dashboard)
+                    @if (isset($account) && $account->enable_client_portal_dashboard)
                         <li {{ Request::is('*client/dashboard') ? 'class="active"' : '' }}>
                             {!! link_to('/client/dashboard', trans('texts.dashboard') ) !!}
                         </li>