diff --git a/packages/builder/src/helpers/validation/yup/index.js b/packages/builder/src/helpers/validation/yup/index.js
index ef359b7df6..b5bdf030a5 100644
--- a/packages/builder/src/helpers/validation/yup/index.js
+++ b/packages/builder/src/helpers/validation/yup/index.js
@@ -35,7 +35,7 @@ export const createValidationStore = () => {
         propertyValidator = string().email().nullable()
         break
       case "password":
-        propertyValidator = string().min(8)
+        propertyValidator = string().nullable()
         break
       default:
         propertyValidator = string().nullable()
@@ -45,6 +45,13 @@ 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
+    }
+
     validator[propertyName] = propertyValidator
   }