diff --git a/ChangeLog b/ChangeLog
index 70b62e55a..3a22ea2db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-07  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/MainUI/SOGoUserHomePage.m (-_usersForResults:inDomain:):
+	fixed bug when the domain was empty.
+	(-usersSearchAction): idem.
+
 2011-07-06  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Mailer/NSData+Mail.m (bodyDataFromEncoding:)
diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index b496d15f2..bf2908684 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -329,7 +329,7 @@
   BOOL activeUserIsInDomain;
 
   login = [[context activeUser] login];
-  activeUserIsInDomain = (domain == nil || [[[context activeUser] domain] isEqualToString: domain]);
+  activeUserIsInDomain = ([domain length] == 0 || [[[context activeUser] domain] isEqualToString: domain]);
 
   // We sort our array - this is pretty useful for the Web
   // interface of SOGo.
@@ -347,7 +347,7 @@
       if (!activeUserIsInDomain || ![uid isEqualToString: login])
         {
           jsonLine = [NSMutableArray arrayWithCapacity: 4];
-          if (domain)
+          if ([domain length])
             uid = [NSString stringWithFormat: @"%@@%@", uid, domain];
           [jsonLine addObject: uid];
           [jsonLine addObject: [contact objectForKey: @"cn"]];
@@ -380,7 +380,7 @@
       users = [self _usersForResults: [um fetchUsersMatching: contact
                                                     inDomain: domain]
                             inDomain: domain];
-      if (domain)
+      if ([domain length])
         {
           // Add results from visible domains
           sd = [SOGoSystemDefaults sharedSystemDefaults];