1 files changed, 16 insertions, 1 deletions
diff --git a/app/helpers/admin/user_actions_helper.rb b/app/helpers/admin/user_actions_helper.rb
index cd520a75b44..5719d8f5ffd 100644
--- a/app/helpers/admin/user_actions_helper.rb
+++ b/app/helpers/admin/user_actions_helper.rb
@@ -15,6 +15,7 @@ module Admin
       deactivate_actions
       unlock_actions
       delete_actions
+      ban_actions
 
       @actions
     end
@@ -28,7 +29,7 @@ module Admin
         @actions << 'approve'
         @actions << 'reject'
       elsif @user.blocked?
-        @actions << 'unblock'
+        @actions << 'unblock' unless @user.banned?
       else
         @actions << 'block'
       end
@@ -52,5 +53,19 @@ module Admin
       @actions << 'delete'
       @actions << 'delete_with_contributions'
     end
+
+    def ban_actions
+      return unless ban_feature_available?
+      return if @user.internal?
+
+      if @user.banned?
+        @actions << 'unban'
+        return
+      end
+
+      unless @user.blocked?
+        @actions << 'ban'
+      end
+    end
   end
 end