diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
index e41fb872a6ef..c9047f7ba68b 100644
--- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php
+++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
@@ -52,12 +52,15 @@ class NinjaPlanController extends Controller
             
             Auth::guard('contact')->login($client_contact,true);
 
-            /* Current paid users get pushed straight to subscription overview page*/
-            if($account->isPaidHostedClient())
-                return redirect('/client/dashboard');
+            // /* Current paid users get pushed straight to subscription overview page*/
+            // if($account->isPaidHostedClient())
+            //     return redirect('/client/dashboard');
 
-            /* Users that are not paid get pushed to a custom purchase page */
-            return $this->render('subscriptions.ninja_plan', ['settings' => $client_contact->company->settings]);
+            // /* Users that are not paid get pushed to a custom purchase page */
+            // return $this->render('subscriptions.ninja_plan', ['settings' => $client_contact->company->settings]);
+
+            return $this->plan();
+            
         }
 
         return redirect()->route('client.catchall');
@@ -137,8 +140,7 @@ class NinjaPlanController extends Controller
 
         }
         else
-            return redirect()->route('client.catchall');
-
+            return redirect('/client/dashboard');
             
     }
 }
diff --git a/app/Http/ViewComposers/PortalComposer.php b/app/Http/ViewComposers/PortalComposer.php
index ca8472aaa496..e6b79e6f5a83 100644
--- a/app/Http/ViewComposers/PortalComposer.php
+++ b/app/Http/ViewComposers/PortalComposer.php
@@ -113,7 +113,6 @@ class PortalComposer
 
         $data[] = ['title' => ctrans('texts.payment_methods'), 'url' => 'client.payment_methods.index', 'icon' => 'shield'];
         $data[] = ['title' => ctrans('texts.documents'), 'url' => 'client.documents.index', 'icon' => 'download'];
-        $data[] = ['title' => ctrans('texts.subscriptions'), 'url' => 'client.subscriptions.index', 'icon' => 'calendar'];
 
         if (auth('contact')->user()->client->getSetting('enable_client_portal_tasks')) {
             $data[] = ['title' => ctrans('texts.tasks'), 'url' => 'client.tasks.index', 'icon' => 'clock'];
@@ -123,6 +122,8 @@ class PortalComposer
 
         if(Ninja::isHosted() && auth('contact')->user()->company->id == config('ninja.ninja_default_company_id'))
             $data[] = ['title' => ctrans('texts.plan'), 'url' => 'client.plan', 'icon' => 'credit-card'];
+        else
+            $data[] = ['title' => ctrans('texts.subscriptions'), 'url' => 'client.subscriptions.index', 'icon' => 'calendar'];
 
 
         return $data;