diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index fe0fad23a324..6b5c908ccd51 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -146,6 +146,7 @@ class SetupController extends Controller
             Artisan::call('config:clear');
 
 
+            Artisan::call('key:generate', ['--force' => true]);
             Artisan::call('migrate', ['--force' => true]);
             Artisan::call('db:seed', ['--force' => true]);
             Artisan::call('config:clear');
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 906a18c46c37..f092f2cf9c96 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -3786,7 +3786,7 @@ $lang = array(
     'entity_number_placeholder' => ':entity # :entity_number',
     'email_link_not_working' => 'If the button above isn\'t working for you, please click on the link',
     'display_log' => 'Display Log',
-    'send_fail_logs_to_our_server' => 'Report errors in realtime',
+    'send_fail_logs_to_our_server' => 'Report errors to help improve the app',
     'setup' => 'Setup',
     'quick_overview_statistics' => 'Quick overview & statistics',
     'update_your_personal_info' => 'Update your personal information',
diff --git a/resources/views/setup/_database.blade.php b/resources/views/setup/_database.blade.php
index 6ff0e314e33d..2c4162ec8f0c 100644
--- a/resources/views/setup/_database.blade.php
+++ b/resources/views/setup/_database.blade.php
@@ -25,10 +25,12 @@
                     {{ ctrans('texts.https') }}
                 </dt>
                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="checkbox" class="form-checkbox mr-1" name="https"
-                           {{ old('https') ? 'checked': '' }} checked>
-                    <span>{{ ctrans('texts.require') }}</span>
-                    <span class="text-gray-600 text-xs ml-2">({{ ctrans('texts.recommended_in_production') }})</span>
+                    <label for="https">
+                        <input type="checkbox" class="form-checkbox mr-1" name="https"
+                            id="https" {{ old('https') ? 'checked': '' }} checked>
+                        <span>{{ ctrans('texts.require') }}</span>
+                        <span class="text-gray-600 text-xs ml-2">({{ ctrans('texts.recommended_in_production') }})</span>
+                    </label>
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -36,9 +38,11 @@
                     {{ ctrans('texts.reports') }}
                 </dt>
                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="checkbox" class="form-checkbox mr-1"
-                           name="send_logs" {{ old('send_logs' ? 'checked': '') }}>
-                    <span>{{ ctrans('texts.send_fail_logs_to_our_server') }}</span>
+                    <label for="send_logs">
+                        <input type="checkbox" class="form-checkbox mr-1"
+                            name="send_logs" id="send_logs" {{ old('send_logs' ? 'checked': '') }}>
+                        <span>{{ ctrans('texts.send_fail_logs_to_our_server') }}</span>
+                    </label>
                     <a class="button-link mt-1 block" target="_blank" href="https://www.invoiceninja.com/privacy-policy/">Read more
                         about how we use this.</a>
                 </dd>
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index c77d84ef06d1..09edf14b60bd 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -59,16 +59,20 @@
                     <div class="flex justify-center mt-4 hidden" id="submit-wrapper">
                         <div class="flex flex-col">
                             <div class="mt-4 text-sm">
-                                <input type="checkbox" class="form-checkbox mr-2" name="terms_of_service" required>
-                                <span>{{ ctrans('texts.i_agree') }}
-                                    <a class="button-link text-blue-600" target="_blank" href="https://www.invoiceninja.com/self-hosting-terms-service/">{{ ctrans('texts.terms_of_service') }}</a>
-                                </span>
+                                <label for="terms_of_service">
+                                    <input type="checkbox" class="form-checkbox mr-2" name="terms_of_service" id="terms_of_service" required>
+                                    <span>{{ ctrans('texts.i_agree') }}
+                                        <a class="button-link text-blue-600" target="_blank" href="https://www.invoiceninja.com/self-hosting-terms-service/">{{ ctrans('texts.terms_of_service') }}</a>
+                                    </span>
+                                </label>
                             </div>
                             <div class="mt-2 text-sm">
-                                <input type="checkbox" class="form-checkbox mr-2" name="privacy_policy" required>
-                                <span>{{ ctrans('texts.i_agree') }}
-                                    <a class="button-link text-blue-600" target="_blank" href="https://www.invoiceninja.com/self-hosting-privacy-data-control/">{{ ctrans('texts.privacy_policy') }}</a>
-                                </span>
+                                <label for="privacy_policy">
+                                    <input type="checkbox" class="form-checkbox mr-2" name="privacy_policy" id="privacy_policy" required>
+                                    <span>{{ ctrans('texts.i_agree') }}
+                                        <a class="button-link text-blue-600" target="_blank" href="https://www.invoiceninja.com/self-hosting-privacy-data-control/">{{ ctrans('texts.privacy_policy') }}</a>
+                                    </span>
+                                </label>
                             </div>
 
                             <button type="submit" class="button button-primary bg-blue-600 w-1/2 my-4">{{ ctrans('texts.submit') }}</button>