diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index ea6ab96ef6d6..9587baeee422 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="{{App::getLocale()}}">
 <head>
-    @if (isset($account) && $account->hasFeature(FEATURE_WHITE_LABEL))
+    @if (isset($account) && $account instanceof \App\Models\Account && $account->hasFeature(FEATURE_WHITE_LABEL))
         <title>{{ trans('texts.client_portal') }}</title>
     @else
         <title>{{ isset($title) ? ($title . ' | Invoice Ninja') : ('Invoice Ninja | ' . trans('texts.app_title')) }}</title> 
diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php
index d760747c33e8..dd2c5d6412d2 100644
--- a/resources/views/public/header.blade.php
+++ b/resources/views/public/header.blade.php
@@ -85,12 +85,12 @@
                 <li {{ Request::is('*client/invoices') ? 'class="active"' : '' }}>
                     {!! link_to('/client/invoices', trans('texts.invoices') ) !!}
                 </li>
-                @if ($account->hasFeature(FEATURE_DOCUMENTS))
+                @if (isset($account) && $account->hasFeature(FEATURE_DOCUMENTS))
                     <li {{ Request::is('*client/documents') ? 'class="active"' : '' }}>
                         {!! link_to('/client/documents', trans('texts.documents') ) !!}
                     </li>
                 @endif
-                @if ($account->getTokenGatewayId())
+                @if (isset($account) && $account->getTokenGatewayId())
                     <li {{ Request::is('*client/paymentmethods') ? 'class="active"' : '' }}>
                         {!! link_to('/client/paymentmethods', trans('texts.payment_methods') ) !!}
                     </li>
