diff --git a/ChangeLog b/ChangeLog
index cb9f56dc0..256421b53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MainUI/SOGoRootPage.m (-_standardDefaultAction): add an
+	ending "/" to the active url to avoid a mismatch with the login
+	cookie path.
+
 2010-02-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactLDIFEntry.m
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index 9ea078371..d2df7610c 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -221,7 +221,15 @@
                                               [login stringByEscapingURL]]];
     }
   else
-    response = self;
+    {
+      oldLocation = [[context request] uri];
+      if (![oldLocation hasSuffix: @"/"]
+          && ![oldLocation hasSuffix: @"/view"])
+        response = [self redirectToLocation:
+                           [NSString stringWithFormat: @"%@/", oldLocation]];
+      else
+        response = self;
+    }
 
   return response;
 }