diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 96c9c01451..6bcc5bdb14 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-06 Hirofumi Kosaka <kosaka@rworks.jp>
+
+	* godmode/massive/massive_add_alerts.php: Fixed bug that all
+	agents the user can view would be target of the operation, if
+	the user has an AW privilege for any agent group.
+
 2014-06-05  Sergio Martin <sergio.martin@artica.es>
 
 	* operation/agentes/ver_agente.php: Fix sql error in the layer that 
diff --git a/pandora_console/godmode/massive/massive_add_alerts.php b/pandora_console/godmode/massive/massive_add_alerts.php
index 3eb0b23801..becfb22477 100644
--- a/pandora_console/godmode/massive/massive_add_alerts.php
+++ b/pandora_console/godmode/massive/massive_add_alerts.php
@@ -147,8 +147,8 @@ $table->data[1][0] .= '</span>';
 $agents_alerts = alerts_get_agents_with_alert_template ($id_alert_template, $id_group,
 	false, array ('tagente.nombre', 'tagente.id_agente'));
 
-$agents = agents_get_agents();
-$table->data[1][1] = html_print_select (index_array ($agents, 'id_agente', 'nombre'),
+$agents = agents_get_group_agents (array_keys (users_get_groups ($config["id_user"], "AW", false)));
+$table->data[1][1] = html_print_select ($agents,
 	'id_agents[]', '', '', '', '', true, true, true, '', false, 'width:180px;');
 $table->data[1][2] = __('When select agents');
 $table->data[1][2] .= '<br>';