diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 336c9cef29b9..c4be024856ea 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -118,7 +118,7 @@ class AuthController extends Controller
     public function getLoginWrapper()
     {
         if (! Utils::isNinja() && ! User::count()) {
-            return redirect()->to('/invoice_now');
+            return redirect()->to('/setup');
         }
 
         if (Utils::isNinja()) {
diff --git a/database/migrations/2017_04_16_101744_add_custom_contact_fields.php b/database/migrations/2017_04_16_101744_add_custom_contact_fields.php
index ddf0aa90e0c6..a2319cb1ecbf 100644
--- a/database/migrations/2017_04_16_101744_add_custom_contact_fields.php
+++ b/database/migrations/2017_04_16_101744_add_custom_contact_fields.php
@@ -21,7 +21,7 @@ class AddCustomContactFields extends Migration
             $table->string('custom_value1')->nullable();
             $table->string('custom_value2')->nullable();
         });
-
+        /*
         Schema::table('payment_methods', function ($table) {
             $table->unsignedInteger('account_gateway_token_id')->nullable()->change();
             $table->dropForeign('payment_methods_account_gateway_token_id_foreign');
@@ -38,6 +38,7 @@ class AddCustomContactFields extends Migration
         Schema::table('payments', function ($table) {
             $table->foreign('payment_method_id')->references('id')->on('payment_methods')->onDelete('cascade');
         });
+        */
     }
 
     /**