diff --git a/ChangeLog b/ChangeLog
index 14180fa58..2af8037dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-04-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUser.m ([SOGoUser
+	-initWithLogin:newLoginroles:newRoles]): we make sure realUID is
+	not an empty string.
+
 	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
 	-davResourceType]): we declare self as a "principal".
 
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index db9b6dcbe..1932e9f03 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -194,7 +194,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 		  objectForKey: @"c_uid"];
     }
 
-  if (realUID)
+  if ([realUID length])
     self = [super initWithLogin: realUID roles: newRoles];
   else
     {