diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
index 698b4098e01a..cfaf0bdb2dd7 100644
--- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php
+++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
@@ -163,7 +163,7 @@ class NinjaPlanController extends Controller
         $recurring_invoice->save();
         $r = $recurring_invoice->calc()->getRecurringInvoice();
 
-        $recurring_invoice->service()->start()->save();
+        $recurring_invoice->service()->applyNumber()->start()->save();
 
         LightLogs::create(new TrialStarted())
                  ->increment()
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 66ad2612676a..fbb0aed716ae 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -52,6 +52,9 @@ class SetupController extends Controller
         if ($check['system_health'] == true && $check['simple_db_check'] && Schema::hasTable('accounts') && $account = Account::all()->first()) {
             return redirect('/');
         }
+
+        if(Ninja::isHosted())
+            return redirect('/');
         
         return view('setup.index', ['check' => $check]);
     }