diff --git a/ChangeLog b/ChangeLog
index 915951cb4..b4510ef44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/LDAPSource.m ([LDAPSource
+	-checkLogin:loginToCheckandPassword:passwordToCheck]): initialize
+	didBind to NO to make sure no false authentication is returned if
+	the bind operation is not executed.
+
 2007-08-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoDraftObject.m: added support for the
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index eeb0a14af..c2350e446 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -272,6 +272,8 @@ static int sizeLimit;
   NSString *userDN;
   NGLdapConnection *bindConnection;
 
+  didBind = NO;
+
   if ([loginToCheck length] > 0)
     {
       bindConnection = [[NGLdapConnection alloc] initWithHostName: hostname
@@ -290,13 +292,10 @@ static int sizeLimit;
 				      binddn: userDN
 				      credentials: passwordToCheck];
 	  NS_HANDLER
-	    didBind = NO;
 	  NS_ENDHANDLER
 	}
       [bindConnection release];
     }
-  else
-    didBind = NO;
 
   return didBind;
 }