diff --git a/src/components/admin/popup/CrudPopup.svelte b/src/components/admin/popup/CrudPopup.svelte
index a2fc14e..88e0037 100644
--- a/src/components/admin/popup/CrudPopup.svelte
+++ b/src/components/admin/popup/CrudPopup.svelte
@@ -128,13 +128,8 @@
     submitEnabled = false;
     for (const key of keys) {
       for (const k of key) {
-        if (k.options?.validate) {
-          if (k.options?.required && !target[k.key]) {
-            return;
-          } else if (k.options?.required || target[k.key]) {
-            if (!k.options.validate(target[k.key])) return;
-          }
-        }
+        if (k.options?.required && (!target[k.key] || (k.options.validate && !k.options.validate(target[k.key]))))
+          return;
       }
     }
     submitEnabled = true;