diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 124d674dbb..d4ed75fe25 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -236,7 +236,8 @@ slap_passwd_check(
 		ldap_pvt_thread_mutex_unlock( &crypt_mutex );
 #endif
 
-		return result;
+		if( !result )
+			return result;
 	}
 
 	return( 1 );