diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f1d3db2277..8b0426ed4a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -114,7 +114,7 @@ def list
                           .order(order_string)
                           .page(params[:page])
     end
-    @users = @users.where('users.status = 1') unless current_user && (current_user.role == "admin" || current_user.role == "moderator")
+    @users = @users.where('users.status = 1') unless current_user && (current_user.can_moderate?)
   end
 
   def profile
@@ -165,7 +165,7 @@ def profile
       end
 
       if @user.status == 0
-        if current_user && (current_user.role == "admin" || current_user.role == "moderator")
+        if current_user && (current_user.can_moderate?)
           flash.now[:error] = I18n.t('users_controller.user_has_been_banned')
         else
           flash[:error] = I18n.t('users_controller.user_has_been_banned')
@@ -259,7 +259,7 @@ def comments
 
   def photo
     @user = DrupalUser.find_by(uid: params[:uid]).user
-    if current_user.uid == @user.uid || current_user.role == "admin"
+    if current_user.uid == @user.uid || current_user.admin?
       @user.photo = params[:photo]
       if @user.save!
         if request.xhr?