--- src/users/user-settings.c
+++ src/users/user-settings.c
@@ -725,7 +725,7 @@
 	if (user && !changed)
 		return;
 
-	if (strlen (password) < 6) {
+	if (strlen (password) < 6 && strlen (password) != 0) {
 		*primary_text = g_strdup (_("Password is too short"));
 		*secondary_text = g_strdup (_("User passwords must be longer than 6 characters and preferably "
 					      "formed by numbers, letters and special characters."));
