diff --git a/ChangeLog b/ChangeLog
index c36be425e..1a506694e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxCalendarSelector.m ([UIxCalendarSelector
+	-currentCalendarLogin]): replace css-unsafe characters with _.
+
 	* UI/SOGoUI/UIxComponent.m ([UIxComponent
 	-shortUserNameForDisplay]): simplified method.
 	([-user]): removed method since [context activeUser] is as useful.
diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m
index 7205bfec7..1beef4b43 100644
--- a/UI/Scheduler/UIxCalendarSelector.m
+++ b/UI/Scheduler/UIxCalendarSelector.m
@@ -152,13 +152,19 @@ colorForNumber (unsigned int number)
 - (NSString *) currentCalendarLogin
 {
   NSArray *parts;
+  NSMutableString *login;
 
+  login = [NSMutableString string];
   parts = [[currentCalendarFolder objectForKey: @"folder"]
 	    componentsSeparatedByString: @":"];
+  [login appendString: (([parts count] > 1)
+			? [parts objectAtIndex: 0]
+			: [[context activeUser] login])];
+  [login replaceString: @"." withString: @"_"];
+  [login replaceString: @"#" withString: @"_"];
+  [login replaceString: @"@" withString: @"_"];
 
-  return (([parts count] > 1)
-	  ? [parts objectAtIndex: 0]
-	  : [[context activeUser] login]);
+  return login;
 }
 
 - (NSString *) currentCalendarStyle