diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 7855d2484..5140c058b 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -663,12 +663,12 @@ static NSLock *lock;
   contactEntry = [NSMutableDictionary dictionary];
   [contactEntry setObject: [ldapEntry dn] forKey: @"dn"];
   classes = [ldapEntry objectClasses];
+  attributes = [[self _searchAttributes] objectEnumerator];
 
   if (classes)
     {
       [contactEntry setObject: classes
 		       forKey: @"objectClasses"];
-      attributes = [[self _searchAttributes] objectEnumerator];
 
       if ([classes containsObject: @"group"] ||
 	  [classes containsObject: @"groupOfNames"] ||