diff --git a/config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeed.xml b/config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeed.xml
index 040d7d0752..fdcddd230b 100644
--- a/config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeed.xml
+++ b/config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeed.xml
@@ -23,7 +23,7 @@
   
    <select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = #feedUserId#
       and post_user_id != #feedUserId#
@@ -32,19 +32,9 @@
       ]]>
    </select>
    
-   <select id="select.activity.feedcontrol" parameterClass="FeedControl" resultClass="long">
-      <![CDATA[
-      select id as id
-      from alf_activity_feed_control
-      where feed_user_id = #feedUserId#
-      and site_network = #siteNetwork#
-      and app_tool = #appTool#
-      ]]>
-   </select>
-   
    <select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = #feedUserId#
       and post_user_id != #feedUserId#
@@ -56,7 +46,7 @@
    
    <select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = ''
       and site_network = #siteNetwork#
diff --git a/config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeedControl.xml b/config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeedControl.xml
index d1b553a72c..a5502fa021 100644
--- a/config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeedControl.xml
+++ b/config/alfresco/activities/org.hibernate.dialect.HSQLDialect/ActivityFeedControl.xml
@@ -22,6 +22,16 @@
       from alf_activity_feed_control
       where feed_user_id = #feedUserId#
       ]]>
+   </select>
+   
+   <select id="select.activity.feedcontrol" parameterClass="FeedControl" resultClass="long">
+      <![CDATA[
+      select id as id
+      from alf_activity_feed_control
+      where feed_user_id = #feedUserId#
+      and site_network = #siteNetwork#
+      and app_tool = #appTool#
+      ]]>
    </select>
 
    <insert id="insert.activity.feedcontrol" parameterClass="FeedControl">
diff --git a/config/alfresco/activities/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed.xml b/config/alfresco/activities/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed.xml
index 0e046c8840..947bd8eaf9 100644
--- a/config/alfresco/activities/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed.xml
+++ b/config/alfresco/activities/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed.xml
@@ -23,7 +23,7 @@
   
    <select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = #feedUserId#
       and post_user_id != #feedUserId#
@@ -34,7 +34,7 @@
    
    <select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = #feedUserId#
       and post_user_id != #feedUserId#
@@ -46,7 +46,7 @@
    
    <select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = ''
       and site_network = #siteNetwork#
diff --git a/config/alfresco/activities/org.hibernate.dialect.Oracle9Dialect/ActivityFeed.xml b/config/alfresco/activities/org.hibernate.dialect.Oracle9Dialect/ActivityFeed.xml
index 176f84f708..ea0fc42e75 100644
--- a/config/alfresco/activities/org.hibernate.dialect.Oracle9Dialect/ActivityFeed.xml
+++ b/config/alfresco/activities/org.hibernate.dialect.Oracle9Dialect/ActivityFeed.xml
@@ -23,7 +23,7 @@
   
    <select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = #feedUserId#
       and post_user_id != #feedUserId#
@@ -34,7 +34,7 @@
    
    <select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = #feedUserId#
       and post_user_id != #feedUserId#
@@ -46,7 +46,7 @@
    
    <select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
       <![CDATA[
-      select id as id, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
+      select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date postDate
       from alf_activity_feed
       where feed_user_id = ''
       and site_network = #siteNetwork#
diff --git a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
index 1a9e172f30..74cfcda31c 100644
--- a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
+++ b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
@@ -283,57 +283,43 @@ public class ActivityServiceImpl implements ActivityService
         
         List<String> activityFeedEntries = new ArrayList<String>();
         
-        String currentUser = AuthenticationUtil.getCurrentUserName();
-        if (currentUser != null)
+        if (! userNamesAreCaseSensitive)
         {
-            if (! userNamesAreCaseSensitive)
+            feedUserId = feedUserId.toLowerCase();
+        }
+
+        try
+        {
+            List<ActivityFeedDAO> activityFeeds = null;
+            if (siteId != null)
             {
-                feedUserId = feedUserId.toLowerCase();
-                currentUser = currentUser.toLowerCase();
+                activityFeeds = feedDaoService.selectUserFeedEntries(feedUserId, format, siteId);
+            }
+            else
+            {
+                activityFeeds = feedDaoService.selectUserFeedEntries(feedUserId, format);
             }
             
-            if ((! authorityService.isAdminAuthority(currentUser)) && (! currentUser.equals(feedUserId)))
+            int count = 0;
+            for (ActivityFeedDAO activityFeed : activityFeeds)
             {
-                throw new AlfrescoRuntimeException("Unable to get feed entries for '" + feedUserId + "' - currently logged in as '" + currentUser +"'");
-            }
-            
-            try
-            {
-                List<ActivityFeedDAO> activityFeeds = null;
-                if (siteId != null)
+                count++;
+                if (count > maxFeedItems)
                 {
-                    activityFeeds = feedDaoService.selectUserFeedEntries(feedUserId, format, siteId);
+                    break;
                 }
-                else
-                {
-                    activityFeeds = feedDaoService.selectUserFeedEntries(feedUserId, format);
-                }
-                
-                int count = 0;
-                for (ActivityFeedDAO activityFeed : activityFeeds)
-                {
-                    count++;
-                    if (count > maxFeedItems)
-                    {
-                        break;
-                    }
-                    activityFeedEntries.add(activityFeed.getJSONString());
-                }
-            }
-            catch (SQLException se)
-            {
-                throw new AlfrescoRuntimeException("Unable to get user feed entries: " + se.getMessage());
-            }
-            catch (JSONException je)
-            {    
-                throw new AlfrescoRuntimeException("Unable to get user feed entries: " + je.getMessage());
+                activityFeedEntries.add(activityFeed.getJSONString());
             }
         }
-        else
+        catch (SQLException se)
         {
-            throw new AlfrescoRuntimeException("Unable to get user feed entries - current user is null");
+            throw new AlfrescoRuntimeException("Unable to get user feed entries: " + se.getMessage());
         }
-        
+        catch (JSONException je)
+        {    
+            throw new AlfrescoRuntimeException("Unable to get user feed entries: " + je.getMessage());
+        }
+    
         return activityFeedEntries;
     }
     
@@ -347,37 +333,28 @@ public class ActivityServiceImpl implements ActivityService
         
         List<String> activityFeedEntries = new ArrayList<String>();
 
-        String currentUser = AuthenticationUtil.getCurrentUserName();
-        if (currentUser != null) 
-        {
-            // TODO - check whether site is public or private, if private, check whether user is member or admin - authorityService.isAdminAuthority(currentUser))
-            try
-            { 
-                List<ActivityFeedDAO> activityFeeds = feedDaoService.selectSiteFeedEntries(siteId, format);
-                
-                int count = 0;
-                for (ActivityFeedDAO activityFeed : activityFeeds)
-                {
-                    count++;
-                    if (count > maxFeedItems)
-                    {
-                        break;
-                    }
-                    activityFeedEntries.add(activityFeed.getJSONString());
-                }
-            }
-            catch (SQLException se)
+        try
+        { 
+            List<ActivityFeedDAO> activityFeeds = feedDaoService.selectSiteFeedEntries(siteId, format);
+            
+            int count = 0;
+            for (ActivityFeedDAO activityFeed : activityFeeds)
             {
-                throw new AlfrescoRuntimeException("Unable to get site feed entries: " + se.getMessage());
-            }
-            catch (JSONException je)
-            {    
-                throw new AlfrescoRuntimeException("Unable to get site feed entries: " + je.getMessage());
+                count++;
+                if (count > maxFeedItems)
+                {
+                    break;
+                }
+                activityFeedEntries.add(activityFeed.getJSONString());
             }
         }
-        else
+        catch (SQLException se)
         {
-            throw new AlfrescoRuntimeException("Unable to get site feed entries - current user is null");
+            throw new AlfrescoRuntimeException("Unable to get site feed entries: " + se.getMessage());
+        }
+        catch (JSONException je)
+        {    
+            throw new AlfrescoRuntimeException("Unable to get site feed entries: " + je.getMessage());
         }
         
         return activityFeedEntries;
diff --git a/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java b/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
index 6c3e030308..67edccd2df 100644
--- a/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
+++ b/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
@@ -27,7 +27,7 @@ package org.alfresco.repo.activities.feed;
 import java.util.Date;
 
 import org.json.JSONException;
-import org.json.JSONStringer;
+import org.json.JSONObject;
 
 /**
  * Activity Feed DAO
@@ -158,22 +158,16 @@ public class ActivityFeedDAO
     
     public String getJSONString() throws JSONException
     {
-       return new JSONStringer()
-           .object()
-           .key("postUserId")
-           .value(postUserId)
-           .key("postDate")
-           .value(postDate)
-           .key("feedUserId")
-           .value(feedUserId)
-           .key("siteNetwork")
-           .value(siteNetwork)
-           .key("activityType")
-           .value(activityType)
-           .key("activitySummary")
-           .value(activitySummary)
-           .key("activitySummaryFormat")
-           .value(activitySummaryFormat)
-       .endObject().toString();
+        JSONObject jo = new JSONObject();
+        
+        jo.put("postUserId", postUserId);
+        jo.put("postDate", postDate);
+        if (feedUserId != null) { jo.put("feedUserId", feedUserId); } // eg. site feed
+        jo.put("siteNetwork", siteNetwork);
+        jo.put("activityType", activityType);
+        jo.put("activitySummary", activitySummary);
+        jo.put("activitySummaryFormat", activitySummaryFormat);
+        
+        return jo.toString();
     }
 }