diff --git a/resources/assets/js/views/install/Database.vue b/resources/assets/js/views/install/Database.vue
index c6389b06c..63d2e68ed 100644
--- a/resources/assets/js/views/install/Database.vue
+++ b/resources/assets/js/views/install/Database.vue
@@ -5,69 +5,69 @@
         <div class="card-body">
             <div role="alert" class="alert alert-danger d-none" :class="(form.response.error) ? 'show' : ''" v-if="form.response.error" v-html="form.response.message"></div>
 
-            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5 mt-0">
-                <div class="sm:col-span-6 form-group required" :class="[{'has-error': form.errors.get('hostname')}]">
-                    <label for="hostname" class="text-black text-sm font-medium">Hostname</label>
-                    <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
+            <form>
+                <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5 mt-0">
+                    <div class="sm:col-span-6 form-group required" :class="[{'has-error': form.errors.get('hostname')}]">
+                        <label for="hostname" class="text-black text-sm font-medium">Hostname</label>
+                        <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
 
-                    <div class="input-group input-group-merge">
-                        <input
-                            class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple"
-                            :class="[{'border-red': form.errors.get('hostname')}, {'border-light-gray': !form.errors.get('hostname')}]"
-                            data-name="hostname"
-                            data-value="localhost"
-                            @keydown="form.errors.clear('hostname')"
-                            v-model="form.hostname"
-                            required="required"
-                            name="hostname"
-                            type="text"
-                            value="localhost"
-                            id="hostname"
-                        />
+                        <div class="input-group input-group-merge">
+                            <input
+                                class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple"
+                                :class="[{'border-red': form.errors.get('hostname')}, {'border-light-gray': !form.errors.get('hostname')}]"
+                                data-name="hostname"
+                                data-value="localhost"
+                                @keydown="form.errors.clear('hostname')"
+                                v-model="form.hostname"
+                                required="required"
+                                name="hostname"
+                                type="text"
+                                value="localhost"
+                                id="hostname"
+                            />
+                        </div>
+
+                        <div class="text-red text-sm mt-1 block" v-if="form.errors.has('hostname')" v-html="form.errors.get('hostname')"></div>
                     </div>
 
-                    <div class="text-red text-sm mt-1 block" v-if="form.errors.has('hostname')" v-html="form.errors.get('hostname')"></div>
-                </div>
+                    <div class="sm:col-span-6 form-group required">
+                        <label for="username" class="text-black text-sm font-medium">Username</label>
+                        <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
 
-                <div class="sm:col-span-6 form-group required">
-                    <label for="username" class="text-black text-sm font-medium">Username</label>
-                    <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
+                        <div class="input-group input-group-merge">
+                            <input 
+                            :class="[{'border-red': form.errors.get('username')}, {'border-light-gray': !form.errors.get('username')}]"
+                            class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="username" @keydown="form.errors.clear('username')" v-model="form.username" required="required" name="username" type="text" id="username" />
+                        </div>
 
-                    <div class="input-group input-group-merge">
-                        <input 
-                        :class="[{'border-red': form.errors.get('username')}, {'border-light-gray': !form.errors.get('username')}]"
-                         class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="username" @keydown="form.errors.clear('username')" v-model="form.username" required="required" name="username" type="text" id="username" />
+                        <div class="text-red text-sm mt-1 block" v-if="form.errors.has('username')" v-html="form.errors.get('username')"></div>
                     </div>
 
-                    <div class="text-red text-sm mt-1 block" v-if="form.errors.has('username')" v-html="form.errors.get('username')"></div>
-                </div>
+                    <div class="sm:col-span-6 form-group">
+                        <label for="password" class="text-black text-sm font-medium">Password</label>
 
-                <div class="sm:col-span-6 form-group">
-                    <label for="password" class="text-black text-sm font-medium">Password</label>
+                        <div class="input-group input-group-merge">
+                            <input 
+                            :class="[{'border-red': form.errors.get('password')}, {'border-light-gray': !form.errors.get('password')}]"
+                            class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="password" v-model="form.password" name="password" type="password" value="" id="password" />
+                        </div>
 
-                    <div class="input-group input-group-merge">
-                        <input 
-                        :class="[{'border-red': form.errors.get('password')}, {'border-light-gray': !form.errors.get('password')}]"
-                        class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="password" v-model="form.password" name="password" type="password" value="" id="password" />
+                        <div class="text-red text-sm mt-1 block" v-if="form.errors.has('password')" v-html="form.errors.get('password')"></div>
                     </div>
 
-                    <div class="text-red text-sm mt-1 block" v-if="form.errors.has('password')" v-html="form.errors.get('password')"></div>
-                </div>
+                    <div class="sm:col-span-6 form-group mb--2 required">
+                        <label for="database" class="text-black text-sm font-medium">Database</label>
+                        <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
 
-                <div class="sm:col-span-6 form-group mb--2 required">
-                    <label for="database" class="text-black text-sm font-medium">Database</label>
-                    <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
+                        <div class="input-group input-group-merge">
+                            <input 
+                            :class="[{'border-red': form.errors.get('database')}, {'border-light-gray': !form.errors.get('database')}]"
+                            class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="database" @keydown="form.errors.clear('database')" v-model="form.database" required="required" name="database" type="text" id="database" />
+                        </div>
 
-                    <div class="input-group input-group-merge">
-                        <input 
-                        :class="[{'border-red': form.errors.get('database')}, {'border-light-gray': !form.errors.get('database')}]"
-                        class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="database" @keydown="form.errors.clear('database')" v-model="form.database" required="required" name="database" type="text" id="database" />
+                        <div class="text-red text-sm mt-1 block" v-if="form.errors.has('database')" v-html="form.errors.get('database')"></div>
                     </div>
-
-                    <div class="text-red text-sm mt-1 block" v-if="form.errors.has('database')" v-html="form.errors.get('database')"></div>
                 </div>
-            </div>
-        </div>
 
                 <div class="sm:col-span-6 flex items-center justify-end mt-3.5">
                     <button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100">
diff --git a/resources/assets/js/views/install/Language.vue b/resources/assets/js/views/install/Language.vue
index 4b90cdad1..be0b5a2cc 100644
--- a/resources/assets/js/views/install/Language.vue
+++ b/resources/assets/js/views/install/Language.vue
@@ -3,22 +3,22 @@
         <InstallSteps :active_state="active"></InstallSteps>
 
         <div class="form-group mb-0">
-            <select v-model="form.lang" name="lang" id="lang" size="13" class="w-full text-black text-sm font-medium">
-                <option v-for="(name, code) in languages" :value="code">
-                    {{ name }}
-                </option>
-            </select>
-        </div>
+            <form>
+                <select v-model="form.lang" name="lang" id="lang" size="13" class="w-full text-black text-sm font-medium">
+                    <option v-for="(name, code) in languages" :value="code">
+                        {{ name }}
+                    </option>
+                </select>
 
-        <div class="relative__footer">
-            <div class="sm:col-span-6 flex items-center justify-end mt-3.5">
-                <button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100">
-                    <i v-if="form.loading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
-                    <span :class="[{'opacity-0': form.loading}]">
-                        Next
-                    </span>
-                </button>
-            </div>
+                <div class="sm:col-span-6 flex items-center justify-end mt-3.5">
+                    <button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100">
+                        <i v-if="form.loading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
+                        <span :class="[{'opacity-0': form.loading}]">
+                            Next
+                        </span>
+                    </button>
+                </div>
+            </form>
         </div>
     </div>
 </template>
diff --git a/resources/assets/js/views/install/Settings.vue b/resources/assets/js/views/install/Settings.vue
index 3cabfe34a..e7c298f9c 100644
--- a/resources/assets/js/views/install/Settings.vue
+++ b/resources/assets/js/views/install/Settings.vue
@@ -2,56 +2,52 @@
     <div>
         <InstallSteps :active_state="active"></InstallSteps>
 
-        <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5 mt-0">
-            <div class="sm:col-span-6 required">
-                <label for="company_name" class="text-black text-sm font-medium">Company Name</label>
-                <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
+        <form>
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5 mt-0">
+                <div class="sm:col-span-6 required">
+                    <label for="company_name" class="text-black text-sm font-medium">Company Name</label>
+                    <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
 
-                <div class="input-group input-group-merge">
-                    <input :class="[{'border-red': form.errors.get('company_name')}, {'border-light-gray': !form.errors.get('company_name')}]" class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="company_name" @keydown="form.errors.clear('company_name')" v-model="form.company_name" required="required" name="company_name" type="text" id="company_name" />
+                    <div class="input-group input-group-merge">
+                        <input :class="[{'border-red': form.errors.get('company_name')}, {'border-light-gray': !form.errors.get('company_name')}]" class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="company_name" @keydown="form.errors.clear('company_name')" v-model="form.company_name" required="required" name="company_name" type="text" id="company_name" />
+                    </div>
                 </div>
 
-                <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('company_email')}]">
-                    <label for="company_email" class="form-control-label">Company Email</label>
+                <div class="sm:col-span-6 required">
+                    <label for="company_email" class="text-black text-sm font-medium">Company Email</label>
+                    <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
 
-            <div class="sm:col-span-6 required">
-                <label for="company_email" class="text-black text-sm font-medium">Company Email</label>
-                <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
-
-                <div class="input-group input-group-merge">
-                    <input :class="[{'border-red': form.errors.get('company_email')}, {'border-light-gray': !form.errors.get('company_email')}]" class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="company_email" @keydown="form.errors.clear('company_email')" v-model="form.company_email" required="required" name="company_email" type="text" id="company_email" />
+                    <div class="input-group input-group-merge">
+                        <input :class="[{'border-red': form.errors.get('company_email')}, {'border-light-gray': !form.errors.get('company_email')}]" class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="company_email" @keydown="form.errors.clear('company_email')" v-model="form.company_email" required="required" name="company_email" type="text" id="company_email" />
+                    </div>
                 </div>
 
-                <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('user_email')}]">
-                    <label for="user_email" class="form-control-label">Admin Email</label>
+                <div class="sm:col-span-6 required">
+                    <label for="user_email" class="text-black text-sm font-medium">Admin Email</label>
+                    <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
 
-            <div class="sm:col-span-6 required">
-                <label for="user_email" class="text-black text-sm font-medium">Admin Email</label>
-                <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
-
-                <div class="input-group input-group-merge">
-                    <input :class="[{'border-red': form.errors.get('user_email')}, {'border-light-gray': !form.errors.get('user_email')}]" class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="user_email" @keydown="form.errors.clear('user_email')" v-model="form.user_email" required="required" name="user_email" type="text" id="user_email" />
+                    <div class="input-group input-group-merge">
+                        <input :class="[{'border-red': form.errors.get('user_email')}, {'border-light-gray': !form.errors.get('user_email')}]" class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="user_email" @keydown="form.errors.clear('user_email')" v-model="form.user_email" required="required" name="user_email" type="text" id="user_email" />
+                    </div>
                 </div>
 
-                <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('user_password')}]">
-                    <label for="user_password" class="form-control-label">Admin Password</label>
+                <div class="sm:col-span-6 required">
+                    <label for="user_password" class="text-black text-sm font-medium">Admin Password</label>
+                    <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
 
-            <div class="sm:col-span-6 required">
-                <label for="user_password" class="text-black text-sm font-medium">Admin Password</label>
-                <span class="text-red ltr:ml-1 rtl:mr-1">*</span>
-
-                <div class="input-group input-group-merge">
-                    <input :class="[{'border-red': form.errors.get('user_password')}, {'border-light-gray': !form.errors.get('user_password')}]" class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg borde text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="user_password" @keydown="form.errors.clear('user_password')" v-model="form.user_password" required="required" name="user_password" type="password" value="" id="user_password" />
+                    <div class="input-group input-group-merge">
+                        <input :class="[{'border-red': form.errors.get('user_password')}, {'border-light-gray': !form.errors.get('user_password')}]" class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg borde text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" data-name="user_password" @keydown="form.errors.clear('user_password')" v-model="form.user_password" required="required" name="user_password" type="password" value="" id="user_password" />
+                    </div>
                 </div>
-            </div>
 
-            <div class="sm:col-span-6 flex items-center justify-end mt-3.5">
-                <button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100">
-                    <i v-if="form.loading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
-                    <span :class="[{'opacity-0': form.loading}]">
-                        Next
-                    </span>
-                </button>
+                <div class="sm:col-span-6 flex items-center justify-end mt-3.5">
+                    <button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100">
+                        <i v-if="form.loading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
+                        <span :class="[{'opacity-0': form.loading}]">
+                            Next
+                        </span>
+                    </button>
+                </div>
             </div>
         </form>
     </div>