diff --git a/ChangeLog b/ChangeLog
index 7428f934f..a842fb3d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/NSString+Utilities.m
+	(-composeURLWithAction:parameters:andHash:): don't attempt to add
+	parameters if the parameters argument is empty.
+
 	* UI/Common/UIxPageFrame.m (-canLogoff)): return YES when the
 	authentication type is set to "cas" and SOGoCASLogoutEnabled is
 	set.
diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 48a9c7ee9..d56c317f7 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -59,7 +59,8 @@ static int cssEscapingCount;
   if (![completeURL hasSuffix: @"/"])
     [completeURL appendString: @"/"];
   [completeURL appendString: action];
-  [completeURL appendString: [urlParameters asURLParameters]];
+  if (urlParameters)
+    [completeURL appendString: [urlParameters asURLParameters]];
   if (useHash)
     [completeURL appendString: @"#"];