diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index ca65498b4..3fff2bb5a 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -277,7 +277,7 @@
 
 - (void) _fetchCN
 {
-  cn = [self _fetchFieldForUser: @"cn"];
+  cn = [[self _fetchFieldForUser: @"cn"] stringByTrimmingSpaces];
   [cn retain];
 }
 
@@ -703,7 +703,8 @@
       if (![fullName length])
         fullName = login;
       [identity setObject: fullName forKey: @"fullName"];
-      [identity setObject: [mails objectAtIndex: count] forKey: @"email"];
+      [identity setObject: [[mails objectAtIndex: count] stringByTrimmingSpaces]
+                   forKey: @"email"];
 
       if ([replyTo length] > 0)
         [identity setObject: replyTo forKey: @"replyTo"];
diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m
index 81f6cada8..bba384f43 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.m
+++ b/SoObjects/SOGo/SOGoUserDefaults.m
@@ -558,7 +558,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   if ([newValue length] == 0)
     newValue = nil;
-  [self setObject: newValue forKey: @"SOGoMailCustomFullName"];
+  [self setObject: [newValue stringByTrimmingSpaces]
+           forKey: @"SOGoMailCustomFullName"];
 }
 
 - (NSString *) mailCustomFullName
@@ -570,7 +571,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   if ([newValue length] == 0)
     newValue = nil;
-  [self setObject: newValue forKey: @"SOGoMailCustomEmail"];
+  [self setObject: [newValue stringByTrimmingSpaces]
+           forKey: @"SOGoMailCustomEmail"];
 }
 
 - (NSString *) mailCustomEmail
@@ -582,7 +584,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   if ([newValue length] == 0)
     newValue = nil;
-  [self setObject: newValue forKey: @"SOGoMailReplyTo"];
+  [self setObject: [newValue stringByTrimmingSpaces]
+           forKey: @"SOGoMailReplyTo"];
 }
 
 - (NSString *) mailReplyTo