--- SoObjects/SOGo/SOGoUserManager.m.bak	2011-03-07 00:09:04.000000000 +0100
+++ SoObjects/SOGo/SOGoUserManager.m	2011-03-07 00:15:44.000000000 +0100
@@ -523,19 +523,22 @@
   NSMutableArray *emails;
   SOGoDomainDefaults *dd;
 
-  domain = [contact objectForKey: @"c_domain"];
-  if ([domain length])
-    dd = [SOGoDomainDefaults defaultsForDomain: domain];
-  else
-    dd = [SOGoSystemDefaults sharedSystemDefaults];
   emails = [contact objectForKey: @"emails"];
-  uid = [contact objectForKey: @"c_uid"];
-  if ([uid rangeOfString: @"@"].location == NSNotFound)
-    systemEmail
-      = [NSString stringWithFormat: @"%@@%@", uid, [dd mailDomain]];
-  else
-    systemEmail = uid;
-  [emails addObject: systemEmail];
+  if ([emails count] == 0)
+  {
+    domain = [contact objectForKey: @"c_domain"];
+    if ([domain length])
+      dd = [SOGoDomainDefaults defaultsForDomain: domain];
+    else
+      dd = [SOGoSystemDefaults sharedSystemDefaults];
+    uid = [contact objectForKey: @"c_uid"];
+    if ([uid rangeOfString: @"@"].location == NSNotFound)
+      systemEmail
+        = [NSString stringWithFormat: @"%@@%@", uid, [dd mailDomain]];
+    else
+      systemEmail = uid;
+    [emails addObject: systemEmail];
+  }
   [contact setObject: [emails objectAtIndex: 0] forKey: @"c_email"];
 }