diff --git a/ChangeLog b/ChangeLog
index 2f52970a..aa72d20f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-05  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* libmisc/isexpired.c: If there are no shadow entry, there is no
+	need to convert the password entry to a shadow entry. The password
+	is valid.
+
 2009-04-05  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/usermod.8.xml: Split some paragraphs into smaller units.
diff --git a/libmisc/isexpired.c b/libmisc/isexpired.c
index 728159fb..aad91c5e 100644
--- a/libmisc/isexpired.c
+++ b/libmisc/isexpired.c
@@ -66,7 +66,7 @@ int isexpired (const struct passwd *pw, const struct spwd *sp)
 	now = (long) time ((time_t *) 0) / SCALE;
 
 	if (NULL == sp) {
-		sp = pwd_to_spwd (pw);
+		return 0;
 	}
 
 	/*