diff --git a/packages/vue-components/src/components/OmegaForm/OmegaErrorsInternal.vue b/packages/vue-components/src/components/OmegaForm/OmegaErrorsInternal.vue
index 4ee8cab994..2ed81f2233 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaErrorsInternal.vue
+++ b/packages/vue-components/src/components/OmegaForm/OmegaErrorsInternal.vue
@@ -74,45 +74,27 @@
 <script setup lang="ts">
 import { mdiLink } from "@mdi/js"
 import type { StandardSchemaV1Issue } from "@tanstack/vue-form"
-import { Array as Array$, Option } from "effect-app"
 import { computed, getCurrentInstance } from "vue"
 import { useIntl } from "../../utils"
-import { type OmegaError, type OmegaFormApi } from "./OmegaFormStuff"
+import { type OmegaError } from "./OmegaFormStuff"
 
 const instance = getCurrentInstance()
 const vuetified = instance?.appContext.components["VAlert"]
 
 const props = defineProps<
   {
-    form: OmegaFormApi<any, any>
-    fieldMap: Map<string, { id: string; label: string }>
+    generalErrors: (Record<string, StandardSchemaV1Issue[]> | undefined)[]
+    errors: OmegaError[]
   }
 >()
 
-const generalErrors = props.form.useStore((state) => state.errors)
-const fieldMeta = props.form.useStore((state) => state.fieldMeta)
-const errors = computed(() =>
-  Array$.filterMap(
-    Object
-      .entries(fieldMeta.value),
-    ([key, m]): Option.Option<OmegaError> =>
-      ((m as any).errors ?? []).length && props.fieldMap.get(key)?.id
-        ? Option.some({
-          label: props.fieldMap.get(key)!.label,
-          inputId: props.fieldMap.get(key)!.id,
-          errors: ((m as any).errors ?? []).map((e: any) => e.message).filter(Boolean)
-        })
-        : Option.none()
-  )
-)
-
 const { trans } = useIntl()
 
 const showedGeneralErrors = computed(() => {
-  if (!generalErrors.value) return []
+  if (!props.generalErrors) return []
 
-  return generalErrors
-    .value
+  return props
+    .generalErrors
     .filter((record): record is Record<string, StandardSchemaV1Issue[]> => Boolean(record))
     .flatMap((errorRecord) =>
       Object
diff --git a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
index 196e06829d..fbd735450f 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
+++ b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
@@ -7,8 +7,6 @@ import { getTransformationFrom, useIntl } from "../../utils"
 import { type OmegaFieldInternalApi } from "./InputProps"
 import { type OF, type OmegaFormReturn } from "./useOmegaForm"
 
-export type ShowErrorsOn = "onChange" | "onBlur" | "onSubmit"
-
 export type BaseProps<From, TName extends DeepKeys<From>> = {
   /** Will fallback to i18n when not specified */
   label?: string
diff --git a/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts b/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
index efe099c531..e29468877b 100644
--- a/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
+++ b/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
@@ -12,7 +12,7 @@ import { MergedInputProps } from "./InputProps"
 import OmegaArray from "./OmegaArray.vue"
 import OmegaAutoGen from "./OmegaAutoGen.vue"
 import OmegaErrorsInternal from "./OmegaErrorsInternal.vue"
-import { BaseProps, DefaultTypeProps, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState, OmegaInputProps, ShowErrorsOn } from "./OmegaFormStuff"
+import { BaseProps, DefaultTypeProps, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState, OmegaInputProps } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import OmegaForm from "./OmegaWrapper.vue"
 
@@ -73,14 +73,33 @@ const eHoc = (errorProps: {
   ): ConcreteComponent<P> {
     return {
       setup() {
+        const { fieldMap, form } = errorProps
+        const generalErrors = form.useStore((state) => state.errors)
+        const fieldMeta = form.useStore((state) => state.fieldMeta)
+        const errors = computed(() =>
+          Array.filterMap(
+            Object
+              .entries(fieldMeta.value),
+            ([key, m]): Option.Option<OmegaError> =>
+              ((m as any).errors ?? []).length && fieldMap.value.get(key)?.id
+                ? Option.some({
+                  label: fieldMap.value.get(key)!.label,
+                  inputId: fieldMap.value.get(key)!.id,
+                  errors: ((m as any).errors ?? []).map((e: any) => e.message).filter(Boolean)
+                })
+                : Option.none()
+          )
+        )
+
         return {
-          ...errorProps
+          generalErrors,
+          errors
         }
       },
-      render({ fieldMap, form }: any) {
+      render({ errors, generalErrors }: any) {
         return h(WrappedComponent, {
-          form,
-          fieldMap,
+          errors,
+          generalErrors,
           ...this.$attrs
         } as any, this.$slots)
       }
@@ -90,7 +109,6 @@ const eHoc = (errorProps: {
 
 export type OmegaConfig<T> = {
   i18nNamespace?: string
-  showErrorsOn?: ShowErrorsOn
 
   persistency?: {
     /** Order of importance:
@@ -188,11 +206,6 @@ export interface OmegaFormReturn<
             >,
             never
           >
-          // & {
-          //   errors: readonly OmegaError[]
-          //   generalErrors: (Record<string, StandardSchemaV1Issue[]> | undefined)[] | undefined
-          //   showErrors: boolean
-          // }
           & Partial<{}>
         >
         & import("vue").PublicProps