diff --git a/config/alfresco/templates/activities-email-templates/activities-email.ftl b/config/alfresco/templates/activities-email-templates/activities-email.ftl
index 7346919fd1..032103a54f 100644
--- a/config/alfresco/templates/activities-email-templates/activities-email.ftl
+++ b/config/alfresco/templates/activities-email-templates/activities-email.ftl
@@ -89,7 +89,7 @@
                                                 <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
                                                 
                                                 <div class="activity">
-                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if>
+                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
                                                 </div>
                                                 <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
                                                    ${activity.postDate?datetime?string.medium}
diff --git a/config/alfresco/templates/activities-email-templates/activities-email_de.ftl b/config/alfresco/templates/activities-email-templates/activities-email_de.ftl
index 3d276af6a6..bd39a19750 100644
--- a/config/alfresco/templates/activities-email-templates/activities-email_de.ftl
+++ b/config/alfresco/templates/activities-email-templates/activities-email_de.ftl
@@ -89,7 +89,7 @@
                                                 <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
                                                 
                                                 <div class="activity">
-                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if>
+                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
                                                 </div>
                                                 <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
                                                    ${activity.postDate?datetime?string.medium}
diff --git a/config/alfresco/templates/activities-email-templates/activities-email_es.ftl b/config/alfresco/templates/activities-email-templates/activities-email_es.ftl
index 4fe933153c..3fc1e3ce7f 100644
--- a/config/alfresco/templates/activities-email-templates/activities-email_es.ftl
+++ b/config/alfresco/templates/activities-email-templates/activities-email_es.ftl
@@ -89,7 +89,7 @@
                                                 <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
                                                 
                                                 <div class="activity">
-                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if>
+                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
                                                 </div>
                                                 <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
                                                    ${activity.postDate?datetime?string.medium}
diff --git a/config/alfresco/templates/activities-email-templates/activities-email_fr.ftl b/config/alfresco/templates/activities-email-templates/activities-email_fr.ftl
index 3ad13fdbb4..c68d902592 100644
--- a/config/alfresco/templates/activities-email-templates/activities-email_fr.ftl
+++ b/config/alfresco/templates/activities-email-templates/activities-email_fr.ftl
@@ -89,7 +89,7 @@
                                                 <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
                                                 
                                                 <div class="activity">
-                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if>
+                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
                                                 </div>
                                                 <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
                                                    ${activity.postDate?datetime?string.medium}
diff --git a/config/alfresco/templates/activities-email-templates/activities-email_it.ftl b/config/alfresco/templates/activities-email-templates/activities-email_it.ftl
index e0528ab89c..f2a56632aa 100644
--- a/config/alfresco/templates/activities-email-templates/activities-email_it.ftl
+++ b/config/alfresco/templates/activities-email-templates/activities-email_it.ftl
@@ -89,7 +89,7 @@
                                                 <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
                                                 
                                                 <div class="activity">
-                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if>
+                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
                                                 </div>
                                                 <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
                                                    ${activity.postDate?datetime?string.medium}
diff --git a/config/alfresco/templates/activities-email-templates/activities-email_ja.ftl b/config/alfresco/templates/activities-email-templates/activities-email_ja.ftl
index 5710268ae7..4c146a70a2 100644
--- a/config/alfresco/templates/activities-email-templates/activities-email_ja.ftl
+++ b/config/alfresco/templates/activities-email-templates/activities-email_ja.ftl
@@ -89,7 +89,7 @@
                                                 <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
                                                 
                                                 <div class="activity">
-                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if>
+                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
                                                 </div>
                                                 <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
                                                    ${activity.postDate?datetime?string.medium}
diff --git a/config/alfresco/templates/activities-email-templates/activities-email_nl.ftl b/config/alfresco/templates/activities-email-templates/activities-email_nl.ftl
index 0dfd9a99b8..b9bebaea66 100644
--- a/config/alfresco/templates/activities-email-templates/activities-email_nl.ftl
+++ b/config/alfresco/templates/activities-email-templates/activities-email_nl.ftl
@@ -89,7 +89,7 @@
                                                 <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
                                                 
                                                 <div class="activity">
-                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if>
+                                                   <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
                                                 </div>
                                                 <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
                                                    ${activity.postDate?datetime?string.medium}
diff --git a/source/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java b/source/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java
index 64d3ba359b..c8102f8c0a 100644
--- a/source/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java
+++ b/source/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Alfresco Software Limited.
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -20,6 +20,7 @@ package org.alfresco.repo.domain.activities;
 
 import java.util.Date;
 
+import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.cmr.repository.NodeRef;
   
 /**
@@ -41,7 +42,7 @@ public class ActivityPostEntity
     private Date lastModified; // for debug
     
     // derived
-    private String tenantDomain;
+    private String tenantDomain = TenantService.DEFAULT_DOMAIN;
     private NodeRef parentNodeRef;
     
     // for selector