diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index 92e335b98a..7ce9aea018 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -2523,39 +2523,43 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
                     }
 
                 }, AuthenticationUtil.SYSTEM_USER_NAME);
-
-                if (currentRole == null)
-                {
-                    AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
-                    if (authorityType == AuthorityType.USER)
-                    {
-                        activityService.postActivity(
-                                ActivityType.SITE_USER_JOINED, shortName,
-                                ACTIVITY_TOOL, getActivityUserData(authorityName, role), authorityName);
-                    } 
-                    else if (authorityType == AuthorityType.GROUP)
+
+                AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
+                String authorityDisplayName = authorityName;
+                if (authorityType == AuthorityType.GROUP)
+                {
+                    authorityDisplayName = authorityService.getAuthorityDisplayName(authorityName);
+                }
+
+                if (currentRole == null)
+                {
+                    if (authorityType == AuthorityType.USER)
+                    {
+                        activityService.postActivity(
+                                ActivityType.SITE_USER_JOINED, shortName,
+                                ACTIVITY_TOOL, getActivityUserData(authorityDisplayName, role), authorityName);
+                    } 
+                    else if (authorityType == AuthorityType.GROUP)
                     { 
-                        String authorityDisplayName = authorityService.getAuthorityDisplayName(authorityName);
-                        activityService.postActivity(
-                                ActivityType.SITE_GROUP_ADDED, shortName,
-                                ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, role));                   
-                    }
-                } 
-                else
-                {
-                    AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
-                    if (authorityType == AuthorityType.USER)
-                    {
-                        activityService.postActivity(
-                                ActivityType.SITE_USER_ROLE_UPDATE, shortName,
-                                ACTIVITY_TOOL, getActivityUserData(authorityName, role));
-                    } 
-                    else if (authorityType == AuthorityType.GROUP)
-                    {
-                        activityService.postActivity(
-                                ActivityType.SITE_GROUP_ROLE_UPDATE, shortName,
-                                ACTIVITY_TOOL, getActivityGroupData(authorityName, role));
-                    }
+                        activityService.postActivity(
+                                ActivityType.SITE_GROUP_ADDED, shortName,
+                                ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, role));                   
+                    }
+                }
+                else
+                {
+                    if (authorityType == AuthorityType.USER)
+                    {
+                        activityService.postActivity(
+                                ActivityType.SITE_USER_ROLE_UPDATE, shortName,
+                                ACTIVITY_TOOL, getActivityUserData(authorityDisplayName, role));
+                    } 
+                    else if (authorityType == AuthorityType.GROUP)
+                    {
+                        activityService.postActivity(
+                                ActivityType.SITE_GROUP_ROLE_UPDATE, shortName,
+                                ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, role));
+                    }
                 }
             } 
             else