diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email.ftl
index e30dd4afd3..15955e4867 100644
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_de.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_de.ftl
index 462fbb0049..2a762b9159 100644
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_de.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_de.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_es.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_es.ftl
index ed66672580..b3cafd07e2 100644
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_es.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_es.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_fr.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_fr.ftl
index 2d580f470f..12ac14390f 100644
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_fr.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_fr.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_it.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_it.ftl
index 11400f97f3..23639aff1f 100644
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_it.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_it.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ja.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ja.ftl
index 42c6267928..7cda86de6e 100644
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ja.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ja.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nb.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nb.ftl
index b5f782923c..a16b591460 100755
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nb.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nb.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nl.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nl.ftl
index 49e9b7d694..bd0647c490 100644
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nl.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nl.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_pt_BR.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_pt_BR.ftl
index 1b0d6b5d15..2c4b64206f 100755
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_pt_BR.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_pt_BR.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ru.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ru.ftl
index 4560454ae2..1c4b8372ee 100755
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ru.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ru.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>                                                   
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_zh_CN.ftl b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_zh_CN.ftl
index f308b48640..4f6032d6c3 100755
--- a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_zh_CN.ftl
+++ b/src/main/resources/alfresco/templates/activities-email-templates/activities-email_zh_CN.ftl
@@ -48,9 +48,9 @@
                                              <#if activities?exists && activities?size &gt; 0>
                                              <#list activities as activity>
                                                 <#if activity.siteNetwork??>
-                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName?html!\"\"} ${activity.activitySummary.lastName?html!\"\"}</a>">
+                                                <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.postUserId?html}/profile\">${activity.activitySummary.firstName!\"\"?html} ${activity.activitySummary.lastName!\"\"?html}</a>">
                                                 <#assign secondUserLink="">
-                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page?html!\"\"}\">${activity.activitySummary.title?html!\"\"}</a>">
+                                                <#assign itemLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/${activity.activitySummary.page!\"\"?html}\">${activity.activitySummary.title!\"\"?html}</a>">
                                                 <#assign siteLink="<a href=\"${shareUrl}/page/site/${activity.siteNetwork?html}/dashboard\">${(siteTitles[activity.siteNetwork]?html)!activity.siteNetwork?html}</a>">
                                                 
                                                 <#assign suppressSite=false>
@@ -61,7 +61,7 @@
                                                       <#assign suppressSite=true>
                                                    <#case "org.alfresco.site.user-role-changed">
                                                       <#assign custom0=message("role."+activity.activitySummary.role)!"">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName?html!\"\"} ${activity.activitySummary.memberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.memberUserName?html}/profile\">${activity.activitySummary.memberFirstName!\"\"?html} ${activity.activitySummary.memberLastName!\"\"?html}</a>">
                                                       <#break>
                                                    <#case "org.alfresco.site.group-added">
                                                    <#case "org.alfresco.site.group-removed">
@@ -71,12 +71,12 @@
                                                       <#assign userLink=activity.activitySummary.groupName?replace("GROUP_", "")>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.followed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName?html!\"\"} ${activity.activitySummary.followerLastName?html!\"\"}</a>">
-                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName?html!\"\"} ${activity.activitySummary.userLastName?html!\"\"}</a>">                                                   
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.followerUserName?html}/profile\">${activity.activitySummary.followerFirstName!\"\"?html} ${activity.activitySummary.followerLastName!\"\"?html}</a>">
+                                                      <#assign secondUserLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.userUserName?html}/profile\">${activity.activitySummary.userFirstName!\"\"?html} ${activity.activitySummary.userLastName!\"\"?html}</a>">                                                   
                                                       <#assign suppressSite=true>
                                                       <#break>
                                                    <#case "org.alfresco.subscriptions.subscribed">
-                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName?html!\"\"} ${activity.activitySummary.subscriberLastName?html!\"\"}</a>">
+                                                      <#assign userLink="<a href=\"${shareUrl}/page/user/${activity.activitySummary.subscriberUserName?html}/profile\">${activity.activitySummary.subscriberFirstName!\"\"?html} ${activity.activitySummary.subscriberLastName!\"\"?html}</a>">
                                                       <#assign custom0=(activity.activitySummary.node!"")?html>
                                                       <#assign suppressSite=true>
                                                       <#break>