diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php
index 374bfcd1f49e..32b25ee11112 100644
--- a/resources/views/portal/ninja2020/layout/app.blade.php
+++ b/resources/views/portal/ninja2020/layout/app.blade.php
@@ -30,15 +30,14 @@
             </script>
         @endif
 
-
         <!-- Title -->
-        @auth()
-            <title>@yield('meta_title', '') — {{ auth('contact')->user()->user->account->isPaid() ? auth('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
-        @endauth
-
-        @guest
-            <title>@yield('meta_title', '') — {{ config('app.name') }}</title>
-        @endguest
+        @if(isset($account) && !$account->isPaid())
+            <title>@yield('meta_title', '') — Invoice Ninja</title>
+        @elseif(isset($company) && !is_null($company))
+            <title>@yield('meta_title', '') — {{ $company->present()->name() }}</title>
+        @else
+            <title>@yield('meta_title', '')</title>
+        @endif
 
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php
index a30bd6b77315..5e6f52d8531f 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -31,13 +31,13 @@
         @endif
 
         <!-- Title -->
-        @auth()
-            <title>@yield('meta_title', '') — {{ auth('contact')->user()->user->account->isPaid() ? auth('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
-        @endauth
-
-        @guest
-            <title>@yield('meta_title', '') — {{ config('app.name') }}</title>
-        @endguest
+        @if(isset($account) && !$account->isPaid())
+            <title>@yield('meta_title', '') — Invoice Ninja</title>
+        @elseif(isset($company) && !is_null($company))
+            <title>@yield('meta_title', '') — {{ $company->present()->name() }}</title>
+        @else
+            <title>@yield('meta_title', '')</title>
+        @endif
 
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">