diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaults.m b/SoObjects/SOGo/SOGoLDAPUserDefaults.m
index 01fc5dad5..8f1638457 100644
--- a/SoObjects/SOGo/SOGoLDAPUserDefaults.m
+++ b/SoObjects/SOGo/SOGoLDAPUserDefaults.m
@@ -133,7 +133,9 @@ _appendAtomToDictionary (_SOGoLDAPValue *atom, _SOGoLDAPValue *dictionary)
   if (oldAtomPtr)
     {
       oldAtom = *oldAtomPtr;
-      if (oldAtom->type == SOGoLDAPAtom)
+      if (oldAtom->type == SOGoLDAPArray)
+	container = oldAtom;
+      else
 	{
 	  container = _createContainer (SOGoLDAPArray);
 	  container->key = oldAtom->key;
@@ -141,12 +143,6 @@ _appendAtomToDictionary (_SOGoLDAPValue *atom, _SOGoLDAPValue *dictionary)
 	  _appendAtomToContainer (oldAtom, container);
 	  *oldAtomPtr = container;
 	}
-      else if (oldAtom->type == SOGoLDAPArray)
-	container = oldAtom;
-      else
-	{
-// 	  some error handling here...
-	}
     }
   else
     container = dictionary;
@@ -352,7 +348,7 @@ _convertLDAPAtomToNSDictionary (_SOGoLDAPValue *atom)
 // dn = "cn=admin,dc=inverse,dc=ca";
 // password = "qwerty";
 // uri = "ldap://127.0.0.1";
-// configDN = @"cn=sogo-config,dc=inverse,dc=ca";
+// configDN = "cn=sogo-config,dc=inverse,dc=ca";
 
 static _SOGoLDAPValue *
 _initLDAPDefaults ()