diff --git a/ChangeLog b/ChangeLog
index 37e37eab..aba117e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-07  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/passwd.c: Exit immediately when unlocking a password would
+	result in a passwordless account. This avoid printing a success
+	message after the warning.
+
 2009-05-07  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/nologin.c: Include <stdlib.h> to get EXIT_FAILURE.
diff --git a/src/passwd.c b/src/passwd.c
index cda99885..58b69dc1 100644
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -519,9 +519,10 @@ static char *update_crypt_pw (char *cp)
 	if (uflg && *cp == '!') {
 		if (cp[1] == '\0') {
 			fprintf (stderr,
-				 _("%s: unlocking the password would result in a passwordless account.\n"
-				   "You should set a password with usermod -p to unlock the password of this account.\n"),
-				 Prog);
+			         _("%s: unlocking the password would result in a passwordless account.\n"
+			           "You should set a password with usermod -p to unlock the password of this account.\n"),
+			         Prog);
+			fail_exit (E_FAILURE);
 		} else {
 			cp++;
 		}