diff --git a/pandora_console/godmode/massive/massive_delete_agents.php b/pandora_console/godmode/massive/massive_delete_agents.php
index e80c4b9756..98612a1b12 100755
--- a/pandora_console/godmode/massive/massive_delete_agents.php
+++ b/pandora_console/godmode/massive/massive_delete_agents.php
@@ -120,6 +120,10 @@ $table->data[1][0] = __('Status');
 $table->data[1][1] = html_print_select($status_list, 'status_agents', 'selected',
 	'', __('All'), AGENT_STATUS_ALL, true);
 
+$table->data[1][2] = __('Only disabled agents');
+$table->data[1][3] = html_print_checkbox ("disabled", 1, $disabled,
+	true, false);
+
 $table->data[2][0] = __('Agents');
 $table->data[2][0] .= '<span id="agent_loading" class="invisible">';
 $table->data[2][0] .= html_print_image('images/spinner.png', true);
@@ -170,6 +174,14 @@ ui_require_jquery_file ('pandora.controls');
 			$("#id_group").trigger("change");
 		});
 		
+		var disabled;
+		
+		$("#checkbox-disabled").click(function () {
+			disabled = this.checked ? 1 : 0;
+			
+			$("#id_group").trigger("change");
+		});
+		
 		$("#id_group").pandoraSelectGroupAgent ({
 			status_agents: function () {
 				return $("#status_agents").val();
@@ -178,6 +190,9 @@ ui_require_jquery_file ('pandora.controls');
 			privilege: "AW",
 			recursion: function() {
 				return recursion;
+			},
+			disabled: function() {
+				return disabled;
 			}
 		});
 		
diff --git a/pandora_console/include/javascript/jquery.pandora.controls.js b/pandora_console/include/javascript/jquery.pandora.controls.js
index ac14b5488e..2dfbaba8b9 100644
--- a/pandora_console/include/javascript/jquery.pandora.controls.js
+++ b/pandora_console/include/javascript/jquery.pandora.controls.js
@@ -42,7 +42,9 @@
 						"id_group" : this.value,
 						"recursion" : config.recursion,
 						"filter_agents_json" : config.filter_agents_json,
-						"disabled" : config.disabled ? 1 : 0,
+						"disabled" : (typeof config.disabled === "function")
+							? (config.disabled() ? 1 : 0)
+							: (config.disabled ? 1 : 0),
 						"status_agents" : config.status_agents,
 						"add_alert_bulk_op" : config.add_alert_bulk_op,
 						"privilege" : config.privilege,