diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue
index 3deb3e984..fa5b6397c 100644
--- a/resources/assets/js/views/wizard/Company.vue
+++ b/resources/assets/js/views/wizard/Company.vue
@@ -72,17 +72,18 @@
                         <div class="flex items-center justify-center mt-5 gap-x-10">
                             <base-button class="w-1/2  flex items-center justify-center px-6 py-1.5 text-base rounded-lg bg-transparent hover:bg-gray-100" @click="next()">{{ translations.company.skip }}</base-button>
 
-                            <base-button
+                            <button
+                                type="submit"
                                 id="button"
                                 :disabled="button_loading"
                                 class="w-1/2 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"
-                                @click="onEditSave()"
+                                @click="onEditSave($event)"
                             >
                                 <i v-if="button_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': button_loading}]">
                                     {{ translations.company.save }}
                                 </span>
-                            </base-button>
+                            </button>
                         </div>
                     </div>
                 </div>
@@ -254,7 +255,9 @@ export default {
             }
         },
 
-        onEditSave() {
+        onEditSave(event) {
+            event.preventDefault();
+            
             FormData.prototype.appendRecursive = function (data, wrapper = null) {
                 for (var name in data) {
                     if (name == "previewElement" || name == "previewTemplate") {
diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue
index 6c909b892..5d740af12 100644
--- a/resources/assets/js/views/wizard/Currencies.vue
+++ b/resources/assets/js/views/wizard/Currencies.vue
@@ -91,16 +91,17 @@
                                                 {{ translations.currencies.cancel }}
                                             </base-button>
 
-                                            <base-button
+                                            <button
+                                                type="submit"
                                                 :disabled="button_loading"
                                                 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"
-                                                @click="onEditForm(item)"
+                                                @click="onEditForm(item, $event)"
                                             >
                                                 <i v-if="button_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': button_loading}]">
                                                     {{ translations.currencies.save }}
                                                 </span>
-                                            </base-button>
+                                            </button>
                                         </div>
                                     </div>
                                 </td>
@@ -159,12 +160,12 @@
                                     {{ translations.currencies.cancel }}
                                 </base-button>
 
-                                <base-button :disabled="button_loading" 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" @click="onSubmitForm()">
+                                <button type="submit" :disabled="button_loading" 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" @click="onSubmitForm($event)">
                                     <i v-if="button_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': button_loading}]">
                                         {{ translations.currencies.save }}
                                     </span>
-                                </base-button>
+                                </button>
                             </div>
                         </div>
                     </div>
@@ -293,7 +294,9 @@ export default {
             }, this);
         },
 
-        onEditForm(item) {
+        onEditForm(item, event) {
+            event.preventDefault();
+
             this.onSubmitEvent(
                 "PATCH",
                 url + "/wizard/currencies/" + item.id,
@@ -303,7 +306,9 @@ export default {
             );
         },
 
-        onSubmitForm() {
+        onSubmitForm(event) {
+            event.preventDefault();
+
             this.onSubmitEvent(
                 "POST",
                 url + "/wizard/currencies",
diff --git a/resources/assets/js/views/wizard/Taxes.vue b/resources/assets/js/views/wizard/Taxes.vue
index b7eee2dce..a29183453 100644
--- a/resources/assets/js/views/wizard/Taxes.vue
+++ b/resources/assets/js/views/wizard/Taxes.vue
@@ -73,16 +73,17 @@
                                                 {{ translations.taxes.cancel }}
                                             </base-button>
 
-                                            <base-button
+                                            <button
+                                                type="submit"
                                                 :disabled="button_loading"
                                                 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"
-                                                @click="onEditForm(item)"
+                                                @click="onEditForm(item, $event)"
                                             >
                                                 <i v-if="button_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': button_loading}]">
                                                     {{ translations.taxes.save }}
                                                 </span>
-                                            </base-button>
+                                            </button>
                                         </div>
                                     </div>
                                 </td>
@@ -131,12 +132,12 @@
                                 {{ translations.taxes.cancel }}
                             </base-button>
 
-                            <base-button :disabled="button_loading" 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" @click="onSubmitForm()">
+                            <button type="submit" :disabled="button_loading" 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" @click="onSubmitForm($event)">
                                 <i v-if="button_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': button_loading}]">
                                     {{ translations.taxes.save }}
                                 </span>
-                            </base-button>
+                            </button>
                         </div>
                     </div>
                 </form>
@@ -227,7 +228,9 @@ export default {
             this.onEjetItem(event, this.taxes, event.tax_id);
         },
 
-        onEditForm(item) {
+        onEditForm(item, event) {
+            event.preventDefault();
+
             this.onSubmitEvent(
                 "PATCH",
                 url + "/wizard/taxes/" + item.id,
@@ -247,7 +250,9 @@ export default {
             this.add_taxes = true;
         },
 
-        onSubmitForm() {
+        onSubmitForm(event) {
+            event.preventDefault();
+            
             this.onSubmitEvent("POST", url + "/wizard/taxes", "type", this.taxes);
 
         },