diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 5cfeecaf4..9046b3229 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -358,7 +358,7 @@
 {
   NSArray *calendars;
 
-  calendars = [[self calendarList] valueForKey: @"folder"];
+  calendars = [[self calendarList] valueForKey: @"nameInContainer"];
 
   return [calendars componentsJoinedByString: @","];
 }
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index a00b4d16d..8aa9c1124 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -74,13 +74,7 @@ function onChangeCalendar(event) {
    var form = document.forms["editform"];
    var urlElems = form.getAttribute("action").split("/");
    var choice = calendars[this.value];
-   var ownerLogin;
-   if (choice.indexOf(":") > -1)
-      ownerLogin = choice.split(":")[0];
-   else
-      ownerLogin = UserLogin;
-   urlElems[urlElems.length-4] = ownerLogin;
-
+   urlElems[urlElems.length-3] = choice;
    form.setAttribute("action", urlElems.join("/"));
 }