diff --git a/ChangeLog b/ChangeLog
index a31110bb8..3b347a659 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-01-27  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* SoObjects/SOGo/LDAPSource.m
+	(-checkLogin:password:perr:expire:grace:): the caching of the DN
+	is now performed only if the DN was found.
+
 	* SoObjects/Mailer/SOGoDraftObject.m (-save): we no longer use the
 	relative URL of the draft folder when it must be created. This
 	fixes an issue when using a subfolder as the drafts folder.
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index fe8631d14..12daf3c56 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -489,11 +489,11 @@ static NSArray *commonSearchFields;
 				   IDField, _login, baseDN];
 	    }
 
-	  // We cache the _login <-> userDN entry to speed up things
-	  [_dnCache setObject: userDN  forKey: _login];
-	  
 	  if (userDN)
 	    {
+	      // We cache the _login <-> userDN entry to speed up things
+	      [_dnCache setObject: userDN  forKey: _login];
+	      
 	      NS_DURING
 		if (!passwordPolicy)
 		  didBind = [bindConnection bindWithMethod: @"simple"