diff --git a/studio/frontend/src/features/auth/components/auth-form.tsx b/studio/frontend/src/features/auth/components/auth-form.tsx
index e8d531c0b4..f17d2af13b 100644
--- a/studio/frontend/src/features/auth/components/auth-form.tsx
+++ b/studio/frontend/src/features/auth/components/auth-form.tsx
@@ -199,6 +199,9 @@ export function AuthForm({ mode }: AuthFormProps): ReactElement | null {
               )}
             </Button>
           </div>
+          {!isLoginMode && (
+            <p className="text-xs text-muted-foreground">Must be at least 8 characters</p>
+          )}
         </div>
 
         {!isLoginMode && (
@@ -223,7 +226,7 @@ export function AuthForm({ mode }: AuthFormProps): ReactElement | null {
         <Button
           type="submit"
           className="w-full"
-          disabled={loading || statusLoading || blockedByState}
+          disabled={loading || statusLoading || blockedByState || (!isLoginMode && password.length < 8)}
         >
           {loading ? "Please wait..." : submitLabel}
         </Button>