diff --git a/app/models/user_event.rb b/app/models/user_event.rb
index 752a02398..ce700a3a4 100644
--- a/app/models/user_event.rb
+++ b/app/models/user_event.rb
@@ -22,8 +22,10 @@ class UserEvent < ApplicationRecord
   delegate :country, :city, :is_proxy?, to: :ip_geolocation, allow_nil: true
 
   def self.visible(user)
-    if user.is_moderator?
+    if user.is_admin?
       all
+    elsif user.is_moderator?
+      where(category: [:login, :logout, :user_creation]).or(where(user: user))
     else
       where(user: user)
     end
diff --git a/app/policies/user_session_policy.rb b/app/policies/user_session_policy.rb
index cb84fe503..db6a26d38 100644
--- a/app/policies/user_session_policy.rb
+++ b/app/policies/user_session_policy.rb
@@ -1,5 +1,5 @@
 class UserSessionPolicy < ApplicationPolicy
   def index?
-    user.is_moderator?
+    user.is_admin?
   end
 end