diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 4f5c96e81..ef8349083 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -2364,7 +2364,8 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
                 [pool release];
                 continue; //user alrady fetch
               }
-              [userLogins addObject: login];
+              if(login != nil)
+                [userLogins addObject: login];
               user = [SOGoUser userWithLogin: login  roles: nil];
               if (user)
                 {
@@ -2397,7 +2398,8 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
                 [pool release];
                 continue; //user alrady fetch
               }
-              [userLogins addObject: login];
+              if(login != nil)
+                [userLogins addObject: login];
               user = [SOGoUser userWithLogin: login  roles: nil];
               if (user)
                 {