diff --git a/ChangeLog b/ChangeLog
index 191ed849..c6cb89af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-28  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/chpasswd.c: Before pam_end(), the return value of the previous
+	pam API was already checked. No need to validate it again.
+
 2007-12-28  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/groupadd.c (find_new_gid): A group with the specified name
diff --git a/src/chpasswd.c b/src/chpasswd.c
index 0a170a8c..bd7d41e7 100644
--- a/src/chpasswd.c
+++ b/src/chpasswd.c
@@ -411,8 +411,7 @@ int main (int argc, char **argv)
 	pw_unlock ();
 
 #ifdef USE_PAM
-	if (retval == PAM_SUCCESS)
-		pam_end (pamh, PAM_SUCCESS);
+	pam_end (pamh, PAM_SUCCESS);
 #endif				/* USE_PAM */
 
 	return (0);