diff --git a/config/alfresco/templates/activities/org/alfresco/blog/post-created.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/blog/post-created.atomentry.ftl
index adedaa7149..c4cb4557d3 100644
--- a/config/alfresco/templates/activities/org/alfresco/blog/post-created.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/blog/post-created.atomentry.ftl
@@ -3,12 +3,12 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <entry xmlns='http://www.w3.org/2005/Atom'>
-   <title>New blog post: ${title!'unknown'}</title>
+   <title>New blog post: ${postTitle!'unknown'}</title>
    <link rel="alternate" type="text/html" href="${(browsePostUrl!'')?replace("&", "&amp;")}" />
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} added blog post <a href="${(browsePostUrl!'')}">${title!'unknown'}</a>.]]>
+      <![CDATA[${username} added blog post <a href="${(browsePostUrl!'')}">${postTitle!'unknown'}</a>.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
diff --git a/config/alfresco/templates/activities/org/alfresco/blog/post-created.rss.ftl b/config/alfresco/templates/activities/org/alfresco/blog/post-created.rss.ftl
index 3c678be6b5..3cf8b5b487 100644
--- a/config/alfresco/templates/activities/org/alfresco/blog/post-created.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/blog/post-created.rss.ftl
@@ -3,9 +3,9 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <item>
-    <title>New blog post: ${title!"unknown"}</title>
+    <title>New blog post: ${postTitle!"unknown"}</title>
     <link>${(browsePostUrl!'')?replace("&", "&amp;")}</link>
     <guid>${id}</guid>
-    <description>${username} added blog post ${title!'unknown'}.</description>
+    <description>${username} added blog post ${postTitle!'unknown'}.</description>
 </item>
 
diff --git a/config/alfresco/templates/activities/org/alfresco/blog/post-deleted.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/blog/post-deleted.atomentry.ftl
index cc6f392065..308f0c886e 100644
--- a/config/alfresco/templates/activities/org/alfresco/blog/post-deleted.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/blog/post-deleted.atomentry.ftl
@@ -3,12 +3,12 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <entry xmlns='http://www.w3.org/2005/Atom'>
-   <title>Blog post deleted: ${title!'unknown'}</title>
+   <title>Blog post deleted: ${postTitle!'unknown'}</title>
    <link rel="alternate" type="text/html" href="${(browsePostListUrl!'')?replace("&", "&amp;")}" />
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} deleted blog post ${title}.]]>
+      <![CDATA[${username} deleted blog post ${postTitle}.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
diff --git a/config/alfresco/templates/activities/org/alfresco/blog/post-deleted.rss.ftl b/config/alfresco/templates/activities/org/alfresco/blog/post-deleted.rss.ftl
index 03530ed7c4..790bf3749f 100644
--- a/config/alfresco/templates/activities/org/alfresco/blog/post-deleted.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/blog/post-deleted.rss.ftl
@@ -3,9 +3,8 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <item>
-    <title>Blog post deleted: ${title!"unknown"}</title>
-    <link>${(browsePostListURL!'')?replace("&", "&amp;")}</link>
+    <title>Blog post deleted: ${postTitle!"unknown"}</title>
     <guid>${id}</guid>
-    <description>${username} deleted blog post ${title}.</description>
+    <description>${username} deleted blog post ${postTitle}.</description>
 </item>
 
diff --git a/config/alfresco/templates/activities/org/alfresco/blog/post-updated.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/blog/post-updated.atomentry.ftl
index b79c5801c4..3824443549 100644
--- a/config/alfresco/templates/activities/org/alfresco/blog/post-updated.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/blog/post-updated.atomentry.ftl
@@ -3,12 +3,12 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <entry xmlns='http://www.w3.org/2005/Atom'>
-   <title>Blog post updated: ${title!'unknown'}</title>
+   <title>Blog post updated: ${postTitle!'unknown'}</title>
    <link rel="alternate" type="text/html" href="${(browsePostUrl!'')?replace("&", "&amp;")}" />
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} updated blog post <a href="${(browsePostUrl!'')}">${title}</a>.]]>
+      <![CDATA[${username} updated blog post <a href="${(browsePostUrl!'')}">${postTitle}</a>.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
diff --git a/config/alfresco/templates/activities/org/alfresco/blog/post-updated.rss.ftl b/config/alfresco/templates/activities/org/alfresco/blog/post-updated.rss.ftl
index 42babc51b2..ca71e5b3e8 100644
--- a/config/alfresco/templates/activities/org/alfresco/blog/post-updated.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/blog/post-updated.rss.ftl
@@ -3,9 +3,9 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <item>
-    <title>Blog post updated: ${title!"unknown"}</title>
+    <title>Blog post updated: ${postTitle!"unknown"}</title>
     <link>${(browsePostUrl!'')?replace("&", "&amp;")}</link>
     <guid>${id}</guid>
-    <description>${username} updated blog post ${title}.</description>
+    <description>${username} updated blog post ${postTitle}.</description>
 </item>
 
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/post-created.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/post-created.atomentry.ftl
index 650cc85706..7c271f0aa4 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/post-created.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/post-created.atomentry.ftl
@@ -3,12 +3,12 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <entry xmlns='http://www.w3.org/2005/Atom'>
-   <title>New discussion: ${title!'unknown'}</title>
+   <title>New discussion: ${topicTitle!'unknown'}</title>
    <link rel="alternate" type="text/html" href="${(browseTopicUrl!'')?replace("&", "&amp;")}" />
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} added topic <a href="${(browseTopicUrl!'')}">${title!'unknown'}</a>.]]>
+      <![CDATA[${username} added topic <a href="${(browseTopicUrl!'')}">${topicTitle!'unknown'}</a>.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/post-created.rss.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/post-created.rss.ftl
index d9f80585f3..b4d10977bb 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/post-created.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/post-created.rss.ftl
@@ -3,9 +3,9 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <item>
-    <title>New discussion: ${title!"unknown"}</title>
+    <title>New discussion: ${topicTitle!"unknown"}</title>
     <link>${(browseTopicUrl!'')?replace("&", "&amp;")}</link>
     <guid>${id}</guid>
-    <description>${username} added topic ${title!'unknown'}.</description>
+    <description>${username} added topic ${topicTitle!'unknown'}.</description>
 </item>
 
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/post-deleted.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/post-deleted.atomentry.ftl
index 2f1cd1fe9c..7e237f96f5 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/post-deleted.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/post-deleted.atomentry.ftl
@@ -3,12 +3,11 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <entry xmlns='http://www.w3.org/2005/Atom'>
-   <title>Discussion topic deleted: ${title!'unknown'}</title>
-   <link rel="alternate" type="text/html" href="${(browseTopicListUrl!'')?replace("&", "&amp;")}" />
+   <title>Discussion topic deleted: ${topicTitle!'unknown'}</title>
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} deleted topic ${title!'unknown'}.]]>
+      <![CDATA[${username} deleted topic ${topicTitle!'unknown'}.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/post-deleted.rss.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/post-deleted.rss.ftl
index 1ab66d9bdf..a8570ed10a 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/post-deleted.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/post-deleted.rss.ftl
@@ -3,9 +3,8 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <item>
-    <title>Discussion topic deleted: ${title!"unknown"}</title>
-    <link>${(browseTopicListURL!'')?replace("&", "&amp;")}</link>
+    <title>Discussion topic deleted: ${topicTitle!"unknown"}</title>
     <guid>${id}</guid>
-    <description>${username} deleted topic ${title!'unknown'}.</description>
+    <description>${username} deleted topic ${topicTitle!'unknown'}.</description>
 </item>
 
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/post-updated.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/post-updated.atomentry.ftl
index 5b91df9cec..c2fee2e761 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/post-updated.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/post-updated.atomentry.ftl
@@ -3,12 +3,12 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <entry xmlns='http://www.w3.org/2005/Atom'>
-   <title>Discussion topic updated: ${title!'unknown'}</title>
+   <title>Discussion topic updated: ${topicTitle!'unknown'}</title>
    <link rel="alternate" type="text/html" href="${(browseTopicUrl!'')?replace("&", "&amp;")}" />
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} updated topic <a href="${(browseTopicUrl!'')}">${title!'unknown'}</a>.]]>
+      <![CDATA[${username} updated topic <a href="${(browseTopicUrl!'')}">${topicTitle!'unknown'}</a>.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/post-updated.rss.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/post-updated.rss.ftl
index 01b20ac5dd..0f872bc6be 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/post-updated.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/post-updated.rss.ftl
@@ -3,9 +3,9 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <item>
-    <title>Discussion topic updated: ${title!"unknown"}</title>
+    <title>Discussion topic updated: ${topicTitle!"unknown"}</title>
     <link>${(browseTopicUrl!'')?replace("&", "&amp;")}</link>
     <guid>${id}</guid>
-    <description>${username} updated topic '${title!'unknown'}'.</description>
+    <description>${username} updated topic '${topicTitle!'unknown'}'.</description>
 </item>
 
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/reply-created.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/reply-created.atomentry.ftl
index 5e617033f3..912ff24c36 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/reply-created.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/reply-created.atomentry.ftl
@@ -3,12 +3,12 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <entry xmlns='http://www.w3.org/2005/Atom'>
-   <title>Reply added: ${title!'unknown'}</title>
+   <title>Reply added: ${topicTitle!'unknown'}</title>
    <link rel="alternate" type="text/html" href="${(browseTopicUrl!'')?replace("&", "&amp;")}" />
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} added a reply to topic <a href="${(browseTopicUrl!'')}">${title!'unknown'}</a>.]]>
+      <![CDATA[${username} added a reply to topic <a href="${(browseTopicUrl!'')}">${topicTitle!'unknown'}</a>.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/reply-created.rss.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/reply-created.rss.ftl
index 6a7c8018eb..f949848685 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/reply-created.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/reply-created.rss.ftl
@@ -3,9 +3,9 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <item>
-    <title>Reply added: ${title!"unknown"}</title>
+    <title>Reply added: ${topicTitle!"unknown"}</title>
     <link>${(browseTopicUrl!'')?replace("&", "&amp;")}</link>
     <guid>${id}</guid>
-    <description>${username} added a reply to topic '${title!'unknown'}'.</description>
+    <description>${username} added a reply to topic '${topicTitle!'unknown'}'.</description>
 </item>
 
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/reply-updated.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/reply-updated.atomentry.ftl
index 62cf32ff88..6b61a57d06 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/reply-updated.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/reply-updated.atomentry.ftl
@@ -3,12 +3,12 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <entry xmlns='http://www.w3.org/2005/Atom'>
-   <title>Reply updated: ${title!'unknown'}</title>
+   <title>Reply updated: ${topicTitle!'unknown'}</title>
    <link rel="alternate" type="text/html" href="${(browseTopicUrl!'')?replace("&", "&amp;")}" />
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} updated a reply of topic <a href="${(browseTopicUrl!'')}">${title!'unknown'}</a>.]]>
+      <![CDATA[${username} updated a reply of topic <a href="${(browseTopicUrl!'')}">${topicTitle!'unknown'}</a>.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
diff --git a/config/alfresco/templates/activities/org/alfresco/discussions/reply-updated.rss.ftl b/config/alfresco/templates/activities/org/alfresco/discussions/reply-updated.rss.ftl
index d28567c81a..27f35d078d 100644
--- a/config/alfresco/templates/activities/org/alfresco/discussions/reply-updated.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/discussions/reply-updated.rss.ftl
@@ -3,9 +3,9 @@
    <#assign username = firstName + " " + lastName>
 </#if>
 <item>
-    <title>Reply updated: ${title!"unknown"}</title>
+    <title>Reply updated: ${topicTitle!"unknown"}</title>
     <link>${(browseTopicUrl!'')?replace("&", "&amp;")}</link>
     <guid>${id}</guid>
-    <description>${username} updated a reply of topic '${title!'unknown'}'.</description>
+    <description>${username} updated a reply of topic '${topicTitle!'unknown'}'.</description>
 </item>
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.js
index b3f543bc78..1617622211 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.js
@@ -1,4 +1,5 @@
 <import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js">
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.js">
 
 /**
  * Deletes a blog post node.
@@ -25,20 +26,19 @@ function main()
       return;
    }
 
+   var item = getBlogPostData(node);
+
    var title = node.properties.title;
    var tags = node.properties.tags;
           
    deleteBlogPost(node);
    
-   // post an activitiy item, but only if we got a site
-   if (url.templateArgs.site != null)
+   if (args["site"] != undefined && args["container"] != undefined && ! item.isDraft)
    {
-      var browsePostListUrl = '/share/page/site/' + url.templateArgs.site + '/blog-postlist?container=' + url.templateArgs.container;
       var data = {
-          title: title,
-          browsePostListUrl: browsePostListUrl
+          postTitle: title
       }
-      activities.postActivity("org.alfresco.blog.post-deleted", url.templateArgs.site, url.templateArgs.container, jsonUtils.toJSONString(data));
+      activities.postActivity("org.alfresco.blog.post-deleted", args["site"], args["container"], jsonUtils.toJSONString(data));
    }
 }
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.js
index d4d48203f4..a2eb8a6f7f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.js
@@ -76,15 +76,15 @@ function main()
    
    model.item = getBlogPostData(node);
    
-   // post an activitiy item, but only if we got a site
-   if (url.templateArgs.site != null && ! model.item.isDraft)
+   if (json.has("site") && json.has("container") && json.has("browsePostUrl") && ! model.item.isDraft)
    {
-      var browsePostUrl = '/share/page/site/' + url.templateArgs.site + '/blog-topicview?container=' + url.templateArgs.container + '&postId=' + node.name;      
+      var browsePostUrl = "" + json.get("browsePostUrl");
+      browsePostUrl = browsePostUrl.replace("{post.name}", model.item.node.properties.name);
       var data = {
-          title: node.properties.title,
+          postTitle: model.item.node.properties.title,
           browsePostUrl: browsePostUrl
       }
-      activities.postActivity("org.alfresco.blog.post-updated", url.templateArgs.site, url.templateArgs.container, jsonUtils.toJSONString(data));
+      activities.postActivity("org.alfresco.blog.post-updated", json.get("site"), json.get("container"), jsonUtils.toJSONString(data));
    }
 }
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.js
index 4e741e4929..f435d10c20 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.js
@@ -74,27 +74,27 @@ function createBlogPost(blogNode)
 
 function main()
 {
-	// get requested node
-	var node = getRequestNode();
-	if (status.getCode() != status.STATUS_OK)
-	{
-		return;
-	}
-	
-	ensureTagScope(node);
-
-	var post = createBlogPost(node);
-	model.item = getBlogPostData(post);
-	
-   // post an activitiy item, but only if we got a site
-   if (url.templateArgs.site != null && ! model.item.isDraft)
+   // get requested node
+   var node = getRequestNode();
+   if (status.getCode() != status.STATUS_OK)
    {
-      var browsePostUrl = '/share/page/site/' + url.templateArgs.site + '/blog-postview?container=' + url.templateArgs.container + '&postId=' + post.name;      
+      return;
+   }
+   
+   ensureTagScope(node);
+
+   var post = createBlogPost(node);
+   model.item = getBlogPostData(post);
+   
+   if (json.has("site") && json.has("container") && json.has("browsePostUrl") && ! model.item.isDraft)
+   {
+      var browsePostUrl = "" + json.get("browsePostUrl");
+      browsePostUrl = browsePostUrl.replace("{post.name}", model.item.node.properties.name);
       var data = {
-          title: post.properties.title,
-          browsePostUrl: browsePostUrl
+         postTitle: model.item.node.properties.title,
+         browsePostUrl: browsePostUrl
       }
-      activities.postActivity("org.alfresco.blog.post-created", url.templateArgs.site, url.templateArgs.container, jsonUtils.toJSONString(data));
+      activities.postActivity("org.alfresco.blog.post-created", json.get("site"), json.get("container"), jsonUtils.toJSONString(data));
    }
 }
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.js
index 7fed69cd34..5497e5a263 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.js
@@ -78,18 +78,17 @@ function main()
    
    model.postData = getTopicPostData(topicPost);
    
-   // post an activitiy item, but only if we got a site
-   if (url.templateArgs.site != null)
+   // create an activity entry
+   if (json.has("site") && json.has("container") && json.has("browseTopicUrl"))
    {
-      var browseTopicUrl = '/share/page/site/' + url.templateArgs.site + '/discussions-postview?container=' + url.templateArgs.container +
-                           + '&path=' + url.templateArgs.path + '&postId=' + topicPost.name;
+      var browseTopicUrl = "" + json.get("browseTopicUrl");
+      browseTopicUrl = browseTopicUrl.replace("{post.name}", model.postData.topic.name);
       var data = {
-          title: model.postData.post.properties.title,
+          topicTitle: model.postData.post.properties.title,
           browseTopicUrl: browseTopicUrl
       }
-      activities.postActivity("org.alfresco.discussions.post-created", url.templateArgs.site, url.templateArgs.container, jsonUtils.toJSONString(data));
-   }
-   
+      activities.postActivity("org.alfresco.discussions.post-created", json.get("site"), json.get("container"), jsonUtils.toJSONString(data));
+   }   
 }
 
 main();
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.js
index b01d2bab31..820a05bdc7 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.js
@@ -75,20 +75,17 @@ function main()
    model.postData = createPostReply(node);
    
    // add an activity item
-   if (json.has("site"))
+   if (json.has("site") && json.has("container") && json.has("browseTopicUrl"))
    {
       // fetch the topic (and with it the root post
-      var topicData = getTopicPostData(model.postData.post.parent);       
-      var site = json.get("site");
-      var container = json.get("container");
-      var path = json.has("path") ? json.get("path") : '';
-      var browseTopicUrl = '/share/page/site/' + site + '/discussions-topicview?container=' + container +
-                          + '&path=' + path + '&postId=' +  topicData.topic.name;
+      var topicData = getTopicPostData(model.postData.post.parent);
+      var browseTopicUrl = json.get("browseTopicUrl");
+      browseTopicUrl = browseTopicUrl.replace("{post.name}", topicData.topic.name);
       var data = {
-         title: topicData.post.properties.title,
+         topicTitle: topicData.post.properties.title,
          browseTopicUrl: browseTopicUrl
       }
-      activities.postActivity("org.alfresco.discussions.reply-created", site, container, jsonUtils.toJSONString(data));
+      activities.postActivity("org.alfresco.discussions.reply-created", json.get("site"), json.get("container"), jsonUtils.toJSONString(data));
    }
 }
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.js
index 514f3b69b4..1c89d259aa 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.js
@@ -10,7 +10,7 @@ function deleteTopicPost(topicNode)
 {
    // fetch the topic info as we need to get the title for the post for the activity
    var data = getTopicPostData(topicNode);
-   var title = data.post.properties.title;
+   var topicTitle = data.post.properties.title;
     
    // we simply delete the complete topic
    var nodeRef = topicNode.nodeRef;
@@ -23,15 +23,12 @@ function deleteTopicPost(topicNode)
    model.message = "Node " + nodeRef + " deleted";
    
    // post an activitiy item, but only if we got a site
-   if (url.templateArgs.site != null)
+   if (args["site"] != undefined && args["container"] != undefined)
    {
-      var browseTopicListUrl = '/share/page/site/' + url.templateArgs.site + '/discussions-topiclist?container=' + url.templateArgs.container +
-                           + '&path=' + url.templateArgs.path;
       var data = {
-          browseTopicListUrl: browseTopicListUrl,
-          title: title
+         topicTitle: topicTitle
       }
-      activities.postActivity("org.alfresco.discussions.post-deleted", url.templateArgs.site, url.templateArgs.container, jsonUtils.toJSONString(data));
+      activities.postActivity("org.alfresco.discussions.post-deleted", args["site"], args["container"], jsonUtils.toJSONString(data));
    }
 }
  
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.js
index 254adfe602..7004ea9a9b 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.js
@@ -97,20 +97,16 @@ function main()
       model.postData = getReplyPostData(postNode);
       
       // add an activity item
-      if (json.has("site"))
+      if (json.has("site") && json.has("container") && json.has("browseTopicUrl"))
       {
-         // fetch the topic (and with it the root post
-         var topicData = getTopicPostData(model.postData.post.parent);       
-         var site = json.get("site");
-         var container = json.get("container");
-         var path = json.has("path") ? json.get("path") : '';
-         var browseTopicUrl = '/share/page/site/' + site + '/discussions-topicview?container=' + container +
-                          + '&path=' + path + '&postId=' +  topicData.topic.name;
+         var topicData = getTopicPostData(model.postData.post.parent);
+         var browseTopicUrl = "" + json.get("browseTopicUrl");
+         browseTopicUrl = browseTopicUrl.replace("{post.name}", topicData.topic.name);
          var data = {
-            title: topicData.post.properties.title,
+            topicTitle: topicData.post.properties.title,
             browseTopicUrl: browseTopicUrl
          }
-         activities.postActivity("org.alfresco.discussions.reply-updated", site, container, jsonUtils.toJSONString(data));
+         activities.postActivity("org.alfresco.discussions.reply-updated", json.get("site"), json.get("container"), jsonUtils.toJSONString(data));
       }
    }
    else
@@ -120,16 +116,17 @@ function main()
       //model.topicpost = getTopicPostData(node);
       model.postData = getTopicPostDataFromTopicAndPosts(topicNode, nodes);
       
-      // post an activitiy item, but only if we got a site
-      if (url.templateArgs.site != null)
+      // add an activity item
+      if (json.has("site") && json.has("container") && json.has("browseTopicUrl"))
       {
-         var browseTopicUrl = '/share/page/site/' + url.templateArgs.site + '/discussions-topicview?container=' + url.templateArgs.container +
-                             + '&path=' + url.templateArgs.path + '&postId=' + model.postData.topic.name;
+         var topicData = getTopicPostData(model.postData.post.parent);
+         var browseTopicUrl = "" + json.get("browseTopicUrl");
+         browseTopicUrl = browseTopicUrl.replace("{post.name}", topicData.topic.name);
          var data = {
-            title: model.postData.post.properties.title,
+            topicTitle: topicData.post.properties.title,
             browseTopicUrl: browseTopicUrl
          }
-         activities.postActivity("org.alfresco.discussions.post-updated", url.templateArgs.site, url.templateArgs.container, jsonUtils.toJSONString(data));
+         activities.postActivity("org.alfresco.discussions.post-updated", json.get("site"), json.get("container"), jsonUtils.toJSONString(data));
       }
    }
 }