diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
index 62c77dcff7..fae5c63be8 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
@@ -90,7 +90,7 @@
    <div id="spacePanel">
       <#-- populated via an AJAX call to 'myspacespanel' webscript -->
       <#-- resolved path, filter and home.noderef required as arguments -->
-      <script>MySpaces.Path="${path?replace("\"","\\\"")}";MySpaces.Filter="${filter}";MySpaces.Home="${home.nodeRef}";</script>
+      <script>MySpaces.ServiceContext="${url.serviceContext}";MySpaces.Path="${path?replace("\"","\\\"")}";MySpaces.Filter="${filter}";MySpaces.Home="${home.nodeRef}";</script>
    </div>
    <div class="spaceFooter">
       <#-- the count value is retrieved and set dynamically from the AJAX webscript output above -->
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.html.ftl
index 38aad02511..9f44639491 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.html.ftl
@@ -14,7 +14,7 @@
          <#if d.isDocument>
             <a href="${url.context}${d.url}" target="new" onclick="event.cancelBubble=true"><img class="spaceIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border=0></a>
          <#else>
-            <a href="${scripturl("${url.context}/service/myspaces?f=${args.f}&p=${args.p}/${d.name}", false)}"><img class="spaceIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border="0" onclick="event.cancelBubble=true;"></a>
+            <a href="${scripturl("${url.serviceContext}/myspaces?f=${args.f}&p=${args.p}/${d.name}", false)}"><img class="spaceIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border="0" onclick="event.cancelBubble=true;"></a>
          </#if>
          <div style="display:none"><img class="spaceIconImage64" alt="" width="64" height="64" src="${url.context}${d.icon64}"></div>
       </div>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl
index 96ec4e2189..e2a45f74af 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl
@@ -38,7 +38,7 @@
    <div id="taskPanel">
       <#-- populated via an AJAX call to 'mytaskspanel' webscript -->
       <#-- resolved filter required as argument -->
-      <script>MyTasks.Filter="${filter}";</script>
+      <script>MyTasks.ServiceContext="${url.serviceContext}";MyTasks.Filter="${filter}";</script>
    </div>
 </td>
 <td width=4 class="paperEdgeRight"><td>
diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js
index a9b9379e68..710a566deb 100644
--- a/source/web/scripts/ajax/myspaces.js
+++ b/source/web/scripts/ajax/myspaces.js
@@ -9,6 +9,7 @@ var MySpaces = {
    Path: null,
    Filter: null,
    Home: null,
+   ServiceContext: null,
    popupPanel: null,
    
    start: function()
@@ -19,7 +20,7 @@ var MySpaces = {
          // is responsible for rendering just the contents of the main panel div
          YAHOO.util.Connect.asyncRequest(
             "GET",
-            getContextPath() + '/service/myspacespanel?p='+MySpaces.Path+'&f='+MySpaces.Filter+'&h='+MySpaces.Home,
+            MySpaces.ServiceContext + '/myspacespanel?p='+MySpaces.Path+'&f='+MySpaces.Filter+'&h='+MySpaces.Home,
             {
                success: function(response)
                {
diff --git a/source/web/scripts/ajax/mytasks.js b/source/web/scripts/ajax/mytasks.js
index c00216fa17..d6eec82aa8 100644
--- a/source/web/scripts/ajax/mytasks.js
+++ b/source/web/scripts/ajax/mytasks.js
@@ -2,6 +2,7 @@ var MyTasks = {
    ANIM_LENGTH: 300,
    DETAIL_PANEL_HEIGHT: 132,
    Filter: null,
+   ServiceContext: null,
    
    start: function()
    {
@@ -11,7 +12,7 @@ var MyTasks = {
          // is responsible for rendering just the contents of the main panel div
          YAHOO.util.Connect.asyncRequest(
             "GET",
-            getContextPath() + '/service/mytaskspanel?f='+MyTasks.Filter,
+            MyTasks.ServiceContext + '/mytaskspanel?f='+MyTasks.Filter,
             {
                success: function(response)
                {