diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.desc.xml
index a30366c2cc..fc6e20bde1 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.desc.xml
@@ -1,8 +1,8 @@
 <webscript>
   <shortname>Activity User Feed Controls</shortname>
   <description>Unset activity feed control (opt-out) for currently logged in user.</description>
-  <url>/api/activities/feed/user/control?s={siteId}&amp;a={appToolId}</url>
-  <url>/api/activities/feed/user/control??s={siteId}&amp;a={appToolId}&amp;format=json</url>
+  <url>/api/activities/feed/control?s={siteId}&amp;a={appToolId}</url>
+  <url>/api/activities/feed/control?s={siteId}&amp;a={appToolId}&amp;format=json</url>
   <format default="json"/>
   <authentication>user</authentication>
   <transaction>required</transaction>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.desc.xml
index 6c3d115d9b..b1874d20c0 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.desc.xml
@@ -1,8 +1,8 @@
 <webscript>
   <shortname>Activity User Feed Controls</shortname>
   <description>Set activity feed control (opt-out) for currently logged in user.</description>
-  <url>/api/activities/feed/user/control</url>
-  <url>/api/activities/feed/user/control?format=json</url>
+  <url>/api/activities/feed/control</url>
+  <url>/api/activities/feed/control?format=json</url>
   <format default="json"/>
   <authentication>user</authentication>
   <transaction>required</transaction>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.desc.xml
index 09bfb849bc..b6b239dda4 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.desc.xml
@@ -1,8 +1,8 @@
 <webscript>
   <shortname>Activity User Feed Controls</shortname>
   <description>Get the activity feed controls (opt-outs) for currently logged in user.</description>
-  <url>/api/activities/feed/user/controls</url>
-  <url>/api/activities/feed/user/controls?format=json</url>
+  <url>/api/activities/feed/controls</url>
+  <url>/api/activities/feed/controls?format=json</url>
   <format default="json"/>
   <authentication>user</authentication>
   <transaction>required</transaction>
diff --git a/source/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java b/source/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java
index d940bb8a65..1ea48f24b2 100644
--- a/source/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java
@@ -75,7 +75,7 @@ public class SiteActivitySystemTest extends TestCase
     private static final String URL_ACTIVITIES = "/api/activities";
     private static final String URL_SITE_FEED = "/feed/site";
     private static final String URL_USER_FEED = "/feed/user";
-    private static final String URL_USER_FEED_CTRL = "/feed/user/control";
+    private static final String URL_USER_FEED_CTRL = "/feed/control";
     
     // Test users & passwords
     private static final String ADMIN_USER = "admin";