diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte
index 4a69aaef74..bc170c47be 100644
--- a/packages/builder/src/components/start/ExportAppModal.svelte
+++ b/packages/builder/src/components/start/ExportAppModal.svelte
@@ -16,7 +16,7 @@
 
   let password = null
   const validation = createValidationStore()
-  validation.addValidatorType("password", "password", true)
+  validation.addValidatorType("password", "password", true, { minLength: 8 })
   $: validation.observe("password", password)
 
   const Step = { CONFIG: "config", SET_PASSWORD: "set_password" }
diff --git a/packages/builder/src/helpers/validation/yup/index.js b/packages/builder/src/helpers/validation/yup/index.js
index 4e84975eb7..b10ed2369e 100644
--- a/packages/builder/src/helpers/validation/yup/index.js
+++ b/packages/builder/src/helpers/validation/yup/index.js
@@ -21,7 +21,7 @@ export const createValidationStore = () => {
     validator[propertyName] = propertyValidator
   }
 
-  const addValidatorType = (propertyName, type, required) => {
+  const addValidatorType = (propertyName, type, required, options) => {
     if (!type || !propertyName) {
       return
     }
@@ -45,11 +45,8 @@ export const createValidationStore = () => {
       propertyValidator = propertyValidator.required()
     }
 
-    // We want to do this after the possible required validation, to prioritise the required error
-    switch (type) {
-      case "password":
-        propertyValidator = propertyValidator.min(8)
-        break
+    if (options?.minLength) {
+      propertyValidator = propertyValidator.min(options.minLength)
     }
 
     validator[propertyName] = propertyValidator