diff --git a/ChangeLog b/ChangeLog
index 37540a66c..efe52cda0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/LDAPSource.m: escape built DNs using the new
+	-[NSString escapedForLDAPDN] method.
+
 2012-02-03  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxMailEditor.js (onRemoveAttachments):
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 005574437..470aee52f 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -34,6 +34,7 @@
 #import <NGLdap/NGLdapAttribute.h>
 #import <NGLdap/NGLdapEntry.h>
 #import <NGLdap/NGLdapModification.h>
+#import <NGLdap/NSString+DN.h>
 
 #import "NSArray+Utilities.h"
 #import "NSString+Utilities.h"
@@ -572,7 +573,7 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
 		}
 	      else
 		userDN = [NSString stringWithFormat: @"%@=%@,%@",
-				   IDField, _login, baseDN];
+				   IDField, [_login escapedForLDAPDN], baseDN];
 	    }
 
 	  if (userDN)
@@ -661,7 +662,7 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
 	    userDN = [self _fetchUserDNForLogin: login];
 	  else
 	    userDN = [NSString stringWithFormat: @"%@=%@,%@",
-			       IDField, login, baseDN];
+			       IDField, [login escapedForLDAPDN], baseDN];
 	  if (userDN)
 	    {
 	      NS_DURING