diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 4300dcbd8a2c..32028ac5422b 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -3214,7 +3214,7 @@ return [
 
     'checkout_com' => 'Checkout.com',
 
-    'footer_label' => 'Copyright © :year Invoice Ninja. All rights reserved.',
+    'footer_label' => 'Copyright © :year :company. All rights reserved.',
 
     'credit_card_invalid' => 'Provided credit card number is not valid.',
     'month_invalid' => 'Provided month is not valid.',
diff --git a/resources/views/portal/ninja2020/components/general/footer.blade.php b/resources/views/portal/ninja2020/components/general/footer.blade.php
index 21f81c0cb901..0bc065662e54 100644
--- a/resources/views/portal/ninja2020/components/general/footer.blade.php
+++ b/resources/views/portal/ninja2020/components/general/footer.blade.php
@@ -1,7 +1,7 @@
 <footer class="bg-white px-4 py-5 shadow px-4 sm:px-6 md:px-8 flex justify-center border border-gray-200 justify-between items-center" x-data="{ privacy: false, tos: false }">
     <section>
-        <span class="text-xs md:text-sm text-gray-700">{{ ctrans('texts.footer_label', ['year' => date('Y')])  }}</span>
-
+        <span class="text-xs md:text-sm text-gray-700">{{ ctrans('texts.footer_label', ['company' => auth('contact')->user() ? (auth('contact')->user()->user->account->isPaid() ? auth('contact')->user()->company->present()->name() : 'Invoice Ninja') : 'Invoice Ninja', 'year' => date('Y')])  }}</span>
+        
         <div class="flex items-center space-x-2">
             @if(strlen($client->getSetting('client_portal_privacy_policy')) > 1)
                 <a x-on:click="privacy = true; tos = false" href="#" class="button-link text-sm primary-color flex items-center">{{ __('texts.privacy_policy')}}</a>
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
index b7d369702d55..cd8b6854ae24 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
@@ -14,6 +14,8 @@
                 </a>
                 @endforeach
             </nav>
+
+            @if(!auth('contact')->user()->user->account->isPaid())
             <div class="flex-shrink-0 flex bg-primary p-4 justify-center">
                 <div class="flex items-center">
                     <a href="https://www.facebook.com/invoiceninja/">
@@ -38,6 +40,7 @@
                     </a>
                 </div>
             </div>
+            @endif
         </div>
         <div class="flex-shrink-0 w-14"></div>
     </div>
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
index d73bd50fbe34..904e9aa07aa7 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
@@ -20,6 +20,8 @@
                 </a>
                 @endforeach
             </nav>
+
+            @if(!auth('contact')->user()->user->account->isPaid())
             <div class="flex-shrink-0 flex bg-primary p-4 justify-center">
                 <div class="flex items-center">
                     <a href="https://www.facebook.com/invoiceninja/">
@@ -44,6 +46,7 @@
                     </a>
                 </div>
             </div>
+            @endif
         </div>
         <div class="flex-shrink-0 w-14"></div>
     </div>
diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php
index 856ca7f09863..8f7436444768 100644
--- a/resources/views/portal/ninja2020/layout/app.blade.php
+++ b/resources/views/portal/ninja2020/layout/app.blade.php
@@ -2,8 +2,6 @@
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 
     <head>
-
-        <!-- Source: https://github.com/invoiceninja/invoiceninja -->
         <!-- Error: {{ session('error') }} -->
 
         @if (config('services.analytics.tracking_id'))
@@ -32,8 +30,15 @@
             </script>
         @endif
 
+
         <!-- Title -->
-        <title>@yield('meta_title', 'Invoice Ninja') — {{ config('app.name') }}</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
 
         <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 64f5716fe0d9..df7c8bed0bf0 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -2,8 +2,6 @@
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 
     <head>
-
-        <!-- Source: https://github.com/invoiceninja/invoiceninja -->
         <!-- Error: {{ session('error') }} -->
 
         @if (config('services.analytics.tracking_id'))
@@ -33,7 +31,13 @@
         @endif
 
         <!-- Title -->
-        <title>@yield('meta_title', 'Invoice Ninja') | {{ config('app.name') }}</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
 
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
