diff --git a/database/migrations/2022_06_16_025156_add_react_switching_flag.php b/database/migrations/2022_06_16_025156_add_react_switching_flag.php
index 3c807d7e417c..6db24aff8096 100644
--- a/database/migrations/2022_06_16_025156_add_react_switching_flag.php
+++ b/database/migrations/2022_06_16_025156_add_react_switching_flag.php
@@ -21,7 +21,7 @@ return new class extends Migration {
     public function up()
     {
         Schema::table('accounts', function (Blueprint $table) {
-            $table->boolean('set_react_as_default_ap')->default(0);
+            $table->boolean('set_react_as_default_ap')->default(1);
         });
     }
 
diff --git a/database/schema/mysql-schema.dump b/database/schema/mysql-schema.dump
index 31efb3175efc..95262fb2134a 100644
--- a/database/schema/mysql-schema.dump
+++ b/database/schema/mysql-schema.dump
@@ -41,7 +41,7 @@ CREATE TABLE `accounts` (
   `hosted_client_count` int(10) unsigned DEFAULT NULL,
   `hosted_company_count` int(10) unsigned DEFAULT NULL,
   `inapp_transaction_id` varchar(100) DEFAULT NULL,
-  `set_react_as_default_ap` tinyint(1) NOT NULL DEFAULT 0,
+  `set_react_as_default_ap` tinyint(1) NOT NULL DEFAULT 1,
   `is_flagged` tinyint(1) NOT NULL DEFAULT 0,
   `is_verified_account` tinyint(1) NOT NULL DEFAULT 0,
   `account_sms_verification_code` text DEFAULT NULL,
diff --git a/resources/views/portal/ninja2020/layout/clean_setup.blade.php b/resources/views/portal/ninja2020/layout/clean_setup.blade.php
index 8894872e218a..62d64724417a 100644
--- a/resources/views/portal/ninja2020/layout/clean_setup.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean_setup.blade.php
@@ -96,9 +96,7 @@
         @stack('head')
 
         @if(strpos(Request::url(),'setup'))
-            <meta name="setup-pdf-check" content="{{ str_replace("setup", "", Request::url())}}setup/check_pdf">
             <meta name="setup-db-check" content="{{ str_replace("setup", "", Request::url())}}setup/check_db">
-            <meta name="setup-email-check" content="{{ str_replace("setup", "", Request::url())}}setup/check_mail">
         @endif
 
         <link rel="stylesheet" type="text/css" href="{{ asset('vendor/cookieconsent@3/cookieconsent.min.css') }}" />
diff --git a/resources/views/setup/_application.blade.php b/resources/views/setup/_application.blade.php
index de2d37c11282..568a081135bb 100644
--- a/resources/views/setup/_application.blade.php
+++ b/resources/views/setup/_application.blade.php
@@ -43,16 +43,6 @@
                         about how we use this.</a>
                 </dd>
             </div>
-            <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
-                <dt class="text-sm leading-5 font-medium text-gray-500">
-                    <button type="button" class="button button-primary bg-blue-600 py-2 px-3 text-xs" id="test-pdf">
-                        {{ ctrans('texts.test_pdf') }}
-                    </button>
-                </dt>
-                <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <div class="alert py-2 bg-white" id="test-pdf-response"></div>
-                </dd>
-            </div>
         </dl>
     </div>
 </div>
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index 971289d9de69..9c095c36957d 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -53,7 +53,6 @@
 
                     @include('setup._application')
                     @include('setup._database')
-                    @include('setup._mail')
                     @include('setup._account')
 
                     <p class="mt-4 text-sm">{{ ctrans('texts.setup_steps_notice') }}</p>