diff --git a/config/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.atomentry.ftl
index b4af237879..203f3e1fb7 100644
--- a/config/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.atomentry.ftl
@@ -8,10 +8,9 @@
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} added <a href="${contentURL}" target="_blank">${fileName}</a> to the <a href="${browseURL}">Document Library</a>.]]>
+      <![CDATA[${username?html} added <a href="${contentURL}" target="_blank">${fileName?html}</a> to the <a href="${browseURL}">Document Library</a>.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
    </author> 
-</entry>
-
+</entry>
\ No newline at end of file
diff --git a/config/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.rss.ftl b/config/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.rss.ftl
index 0133fa6eb3..d0e049482a 100644
--- a/config/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.rss.ftl
@@ -7,5 +7,4 @@
     <link>${browseURL?xml}</link>
     <guid>${id}</guid>
     <description>${username?xml} added ${(fileName!'a new file')?xml} to the Document Library.</description>
-</item>
-
+</item>
\ No newline at end of file
diff --git a/config/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.atomentry.ftl b/config/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.atomentry.ftl
index 38fc13aa10..0e626e808d 100644
--- a/config/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.atomentry.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.atomentry.ftl
@@ -8,10 +8,9 @@
    <id>${id}</id>
    <updated>${xmldate(date)}</updated>
    <summary type="html">
-      <![CDATA[${username} added ${fileCount!"multiple"} files to the <a href="${browseURL}">Document Library</a>.]]>
+      <![CDATA[${username?html} added ${fileCount!"multiple"} files to the <a href="${browseURL}">Document Library</a>.]]>
    </summary>
    <author>
    <name>${userId!""}</name>
    </author> 
-</entry>
-
+</entry>
\ No newline at end of file
diff --git a/config/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.rss.ftl b/config/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.rss.ftl
index e0ea1dc5a9..8a7cdb3273 100644
--- a/config/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.rss.ftl
+++ b/config/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.rss.ftl
@@ -7,5 +7,4 @@
     <link>${browseURL?xml}</link>
     <guid>${id}</guid>
     <description>${username?xml} added ${fileCount!"multiple"} files to the Document Library.</description>
-</item>
-
+</item>
\ No newline at end of file