diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index 244d315ce..f7b07cf3a 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -486,7 +486,7 @@ void setPasswordDialog() async {
         errMsg1 = "";
       });
       final pass = p0.text.trim();
-      if (pass.length < 6) {
+      if (pass.length < 6 && pass.isNotEmpty) {
         setState(() {
           errMsg0 = translate("Too short, at least 6 characters.");
         });
diff --git a/src/ui/index.tis b/src/ui/index.tis
index 81cb588bc..8e2238b2d 100644
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -958,7 +958,7 @@ class PasswordArea: Reactor.Component {
             if (!res) return;
             var p0 = (res.password || "").trim();
             var p1 = (res.confirmation || "").trim();
-            if (p0.length < 6) {
+            if (p0.length < 6 && p0.length != 0) {
                 return translate("Too short, at least 6 characters.");
             }
             if (p0 != p1) {