diff --git a/passwd.c b/passwd.c
index afbba9c..0031778 100644
--- a/passwd.c
+++ b/passwd.c
@@ -210,7 +210,8 @@ main(int argc, char *argv[])
 		if (pw->pw_passwd[0] == '\0') {
 			goto newpass;
 		}
-		if (pw->pw_passwd[0] == 'x')
+		if (pw->pw_passwd[0] == 'x' &&
+		    pw->pw_passwd[1] == '\0')
 			prevhash = spw->sp_pwdp;
 		else
 			prevhash = pw->pw_passwd;