diff --git a/install/core/tpl/step1.tpl b/install/core/tpl/step1.tpl
index b6cc74c0b2..72179a46ca 100644
--- a/install/core/tpl/step1.tpl
+++ b/install/core/tpl/step1.tpl
@@ -13,8 +13,17 @@
             </div>
         </div>
         <div class="cell cell-website form-group">
-            <input class="btn btn-default" type="checkbox" name="license-agree" id="license-agree" class="input-checkbox" value="1" {if $fields['license-agree'].value}checked="checked"{/if}>
-            <label class="point-lbl" for="license-agree">{$langs['labels']['I accept the agreement']}</label>
+            <label class="point-lbl" for="license-agree" style="user-select: none;">
+                <input
+                    type="checkbox"
+                    name="license-agree"
+                    id="license-agree"
+                    class="input-checkbox form-checkbox"
+                    value="1"
+                    {if $fields['license-agree'].value}checked="checked"{/if}
+                >
+                {$langs['labels']['I accept the agreement']}
+            </label>
         </div>
     </form>
 
diff --git a/install/core/tpl/step5.tpl b/install/core/tpl/step5.tpl
index 8f6ba6c35f..2c730f6bd8 100644
--- a/install/core/tpl/step5.tpl
+++ b/install/core/tpl/step5.tpl
@@ -28,7 +28,12 @@
                             {$langs['fields']['Is Shared']}
                         </label>
                         <div class="field field-outboundEmailIsShared">
-                            <input type="checkbox" {if $fields['outboundEmailIsShared'].value} checked {/if} name="outboundEmailIsShared" class="main-element">
+                            <input
+                                type="checkbox"
+                                {if $fields['outboundEmailIsShared'].value} checked {/if}
+                                name="outboundEmailIsShared"
+                                class="main-element form-checkbox"
+                            >
                         </div>
                     </div>
                 </div>
@@ -60,7 +65,11 @@
                             {$langs['fields']['smtpAuth']}
                         </label>
                         <div class="field field-smtpAuth">
-                            <input type="checkbox" name="smtpAuth" class="main-element" {if $fields['smtpAuth'].value} checked {/if}>
+                            <input
+                                type="checkbox"
+                                name="smtpAuth"
+                                class="main-element form-checkbox" {if $fields['smtpAuth'].value} checked {/if}
+                            >
                         </div>
                     </div>