diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.desc.xml
index ffe6402e50..88531d2980 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.desc.xml
@@ -1,9 +1,9 @@
 <webscript>
   <shortname>Activity Type Template</shortname>
   <description>Get the activity type template.</description>
-  <url>/api/activities/template?p={path}</url>
-  <url>/api/activities/template?p={path}&amp;format=text</url>
-  <format default="text"/>
+  <url>/api/activities/template/{path}</url>
+  <url>/api/activities/template/{path}?format=text</url>
+  <format default="text">argument</format>
   <authentication>admin</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.desc.xml
index fa03049684..84cc10810f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.desc.xml
@@ -2,10 +2,10 @@
   <shortname>Activity Template Paths</shortname>
   <description>Get a collection of the template paths.</description>
   <url>/api/activities/templates</url>
-  <url>/api/activities/templates?p={path}&amp;format=json</url>
-  <url>/api/activities/templates?p={path}</url>
-  <url>/api/activities/templates?p={path}&amp;format=json</url>
-  <format default="json"/>
+  <url>/api/activities/templates?format=json</url>
+  <url>/api/activities/templates/{path}</url>
+  <url>/api/activities/templates/{path}?format=json</url>
+  <format default="json">argument</format>
   <authentication>admin</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/web/scripts/activities/TemplateWebScript.java b/source/java/org/alfresco/repo/web/scripts/activities/TemplateWebScript.java
index 88087c04a9..e699d9674b 100644
--- a/source/java/org/alfresco/repo/web/scripts/activities/TemplateWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/activities/TemplateWebScript.java
@@ -31,6 +31,7 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.web.scripts.DeclarativeWebScript;
 import org.alfresco.web.scripts.SearchPath;
 import org.alfresco.web.scripts.Status;
@@ -61,10 +62,16 @@ public class TemplateWebScript extends DeclarativeWebScript
     {
         Map<String, Object> model = new HashMap<String, Object>();
         
-        // process arguments 
-        String path = req.getParameter("p"); // required
+        // process extension
+        String path = req.getExtensionPath(); // required
         
-        if ((path != null) && (path.length() != 0))
+        if ((path == null) || (path.length() == 0))
+        {
+            String msg = "Failed to getTemplate: missing {path}";
+            logger.error(msg);
+            throw new AlfrescoRuntimeException(msg);
+        }
+        else
         {        
             if (path.endsWith(".ftl"))
             {    
diff --git a/source/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java b/source/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java
index 226706b4bd..a59835c480 100644
--- a/source/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java
@@ -29,6 +29,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.web.scripts.DeclarativeWebScript;
 import org.alfresco.web.scripts.SearchPath;
 import org.alfresco.web.scripts.Status;
@@ -53,12 +54,12 @@ public class TemplatesWebScript extends DeclarativeWebScript
     @Override
     protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
     {
-        // process arguments 
-        String p = req.getParameter("p"); // optional
-        
         String path = "/";
         String templatePattern = "*.ftl";
         
+        // process extension
+        String p = req.getExtensionPath(); // optional
+        
         if ((p != null) && (p.length() > 0))
         {
             int idx = p.lastIndexOf("/");