diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b3e808b19..00af13cb5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -442,16 +442,24 @@ class UsersController < ApplicationController
         watcher.push(User.current)
         activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc')
       else
-        activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') 
+        activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
+        activity = activity.reject { |e|
+          !User.current.admin? &&
+              (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
+              (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
+              (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
+              (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
+              (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course)))))
+        }
       end
       @activity_count = activity.count
       @activity_pages = Paginator.new @activity_count, pre_count, params['page']
-      @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page )
-      @activity = @activity.reject { |e|
-        ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
-            ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
-            ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?)))
-      }
+      @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
+      # @activity = @activity.reject { |e|
+      #   ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
+      #       ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
+      #       ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?)))
+      # }
       @state = 0
     end