diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index fe7751fcd..7edbce1f7 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -284,7 +284,11 @@
 
 - (void) _fetchCN
 {
-  cn = [[self _fetchFieldForUser: @"cn"] stringByTrimmingSpaces];
+  cn = [self _fetchFieldForUser: @"cn"];
+  if ([cn isNotNull])
+    cn = [cn stringByTrimmingSpaces];
+  else
+    cn = [NSString stringWithString: login];
   [cn retain];
 }