diff --git a/resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue
index aecd8b4a..9dd5c2d7 100644
--- a/resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue
@@ -181,11 +181,10 @@ const props = defineProps<{
     section: string;
 }>();
 
-const { submit } = useModalFormHandler(props);
+const { submit, error } = useModalFormHandler(props);
 const authStore = useAuthStore();
 const uiStore = useUiStore();
 
-const error = ref('');
 const step = ref(1);
 const parameters = reactive({
     name: '',
diff --git a/resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue
index a79ca6e2..86f6caf4 100644
--- a/resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue
@@ -55,7 +55,7 @@ const props = defineProps<{
     section: string;
 }>();
 
-const { submit } = useModalFormHandler(props);
+const { submit, error } = useModalFormHandler(props);
 const authStore = useAuthStore();
 const uiStore = useUiStore();
 const rules = {
@@ -65,7 +65,6 @@ const rules = {
     }
 };
 
-const error = ref('');
 const parameters = reactive({
     email: '',
     password: ''
diff --git a/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue
index b0388f57..83115dc9 100644
--- a/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue
@@ -90,11 +90,10 @@ const props = defineProps<{
     section: string;
 }>();
 
-const { submit } = useModalFormHandler(props);
+const { submit, error } = useModalFormHandler(props);
 const authStore = useAuthStore();
 const uiStore = useUiStore();
 
-const error = ref('');
 const parameters = reactive({
     company_id: props.id,
     name: '',
diff --git a/resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue
index 81d6680c..04777d4d 100644
--- a/resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue
@@ -85,11 +85,10 @@ const props = defineProps<{
     section: string;
 }>();
 
-const { submit } = useModalFormHandler(props);
+const { submit, error } = useModalFormHandler(props);
 const authStore = useAuthStore();
 const uiStore = useUiStore();
 
-const error = ref('');
 const parameters = reactive({
     name: '',
     email: '',
diff --git a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
index 9e09fa7d..d8df1eee 100644
--- a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
@@ -270,10 +270,9 @@ const props = defineProps<{
     section: string;
 }>();
 
-const { submit } = useModalFormHandler(props);
+const { submit, error } = useModalFormHandler(props);
 const authStore = useAuthStore();
 
-const error = ref('');
 const step = ref(1);
 const parameters = reactive({
     name: '',
diff --git a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
index e14ee442..76497c90 100644
--- a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
+++ b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
@@ -141,7 +141,6 @@ const { submit } = useModalFormHandler(props);
 
 const item = ref(props.data ? JSON.parse(JSON.stringify(props.data)) : {});
 const isLoading = ref(false);
-const error = ref('');
 
 watch(() => props.data, (newData) => {
     if (newData) {
@@ -151,18 +150,6 @@ watch(() => props.data, (newData) => {
     }
 }, { deep: true });
 
-const successHandler = () => {
-    isLoading.value = false;
-    queueStore.reloadList({ name: props.section });
-    error.value = '';
-};
-
-const errorHandler = (err: any) => {
-    isLoading.value = false;
-    queueStore.reloadList({ name: props.section });
-    error.value = err.message || 'An error occurred';
-};
-
 const approveAddress = (status: number) => {
     isLoading.value = true;
     const url = route('api.order.address.status.update', item.value.id, status);
diff --git a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
index 6d230d0d..b3d74740 100644
--- a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
+++ b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
@@ -194,8 +194,6 @@ const props = defineProps<{
     section: string;
 }>();
 
-const queueStore = useQueueStore();
-const uiStore = useUiStore();
 const authStore = useAuthStore();
 const { submit } = useModalFormHandler(props);
 
@@ -204,7 +202,6 @@ const isEditIdentificationNumber = ref(false);
 const isEditCompanyName = ref(false);
 const item = ref(props.data ? JSON.parse(JSON.stringify(props.data)) : {});
 const isLoading = ref(false);
-const error = ref('');
 
 watch(() => props.data, (newData) => {
     if (newData) {
@@ -214,18 +211,6 @@ watch(() => props.data, (newData) => {
     }
 }, { deep: true });
 
-const successHandler = () => {
-    isLoading.value = false;
-    queueStore.reloadList({ name: props.section });
-    error.value = '';
-};
-
-const errorHandler = (err: any) => {
-    isLoading.value = false;
-    queueStore.reloadList({ name: props.section });
-    error.value = err.message || 'An error occurred';
-};
-
 const approveDocument = (status: string) => {
     isLoading.value = true;
     const url = route('api.company.identification.approval', item.value.owner.id, item.value.id, status);
diff --git a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
index fe6484f6..2975d990 100644
--- a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
@@ -76,7 +76,7 @@ const props = defineProps<{
 const emit = defineEmits(['close']);
 
 const uiStore = useUiStore();
-const { submit } = useModalFormHandler({ section: props.section });
+const { submit, error } = useModalFormHandler({ section: props.section });
 
 const parameters = ref({
     starting_on: '',
@@ -85,7 +85,6 @@ const parameters = ref({
     description: '',
 });
 
-const error = ref('');
 
 const rules = {
     parameters: {
diff --git a/resources/assets/vue/components/user/form/UserFormComponent.vue b/resources/assets/vue/components/user/form/UserFormComponent.vue
index 41f5e5fe..771f4ab4 100644
--- a/resources/assets/vue/components/user/form/UserFormComponent.vue
+++ b/resources/assets/vue/components/user/form/UserFormComponent.vue
@@ -76,7 +76,7 @@ const props = defineProps<{
 const emit = defineEmits(['close', 'createdAdmin']);
 
 const uiStore = useUiStore();
-const { submit, closeModal, formHandler: reloadQueue } = useModalFormHandler({ section: props.section });
+const { submit, closeModal, formHandler: reloadQueue , error} = useModalFormHandler({ section: props.section });
 
 const parameters = ref({
     name: '',
@@ -85,8 +85,6 @@ const parameters = ref({
     password_confirmation: '',
 });
 
-const error = ref('');
-
 const rules = computed(() => ({
     parameters: {
         name: { required },