diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 98b026e6b590..a319ce0e402c 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -23,6 +23,6 @@ class Authenticate extends Middleware
      */
     protected function redirectTo($request)
     {
-        return route('login');
+        return route('client.login');
     }
 }
diff --git a/resources/views/portal/default/footer.blade.php b/resources/views/portal/default/footer.blade.php
index a67b5ac4e57d..a719959a3e25 100644
--- a/resources/views/portal/default/footer.blade.php
+++ b/resources/views/portal/default/footer.blade.php
@@ -1,8 +1,10 @@
 </div>
 <footer class="app-footer">
     <div class="ml-auto">
-        <span>Powered by</span>
-        <a href="https://invoiceninja.com">InvoiceNinja</a>  &copy; 2019 Invoice Ninja LLC.
+        @if(!$user->company->account->isPaid())
+            <span>Powered by</span>
+            <a href="https://invoiceninja.com">InvoiceNinja</a>  &copy; 2019 Invoice Ninja LLC.
+        @endif
     </div>
 </footer>
 <!-- Bootstrap and necessary plugins-->
diff --git a/resources/views/portal/default/layouts/master.blade.php b/resources/views/portal/default/layouts/master.blade.php
index 586c248836ff..2740b9e857f0 100644
--- a/resources/views/portal/default/layouts/master.blade.php
+++ b/resources/views/portal/default/layouts/master.blade.php
@@ -24,6 +24,10 @@
             function gtag(){}
         </script>
     @endif
+    
+    @php
+        $user = auth()->guard('contact')->user();
+    @endphp
 
     <meta charset="utf-8">
     <title>@yield('meta_title', 'Invoice Ninja') | {{ config('app.name') }}</title>