diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f3d19c8bbc..d1de0b54cf 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-23  Sergio Martin <sergio.martin@artica.es>
+
+       * godmode/servers/manage_recontask_form.php: 
+	Added the All group to combo
+
 2010-04-23  Sergio Martin <sergio.martin@artica.es>
 
        * operation/visual_console/index.php
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index eceea84dd0..c5c0181b9a 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -46,7 +46,7 @@ if (isset ($_GET["update"])) { // Edit mode
 	$description = "";
 	$id_recon_server = 0;
 	$interval = 43200;
-	$id_group = 1;
+	$id_group = 0;
 	$create_incident = 1;
 	$id_network_profile = 1;
 	$id_os = -1; // Any
@@ -108,7 +108,9 @@ $table->data[6][1] .= '<a href="#" class="tip">&nbsp;<span>'.__('Ports defined l
 
 // Group
 $table->data[7][0] = "<b>".__('Group');
-$table->data[7][1] = print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo WHERE id_grupo > 1 ORDER BY nombre', "id_group", $id_group, '', '', 0, true);
+$groups = get_user_groups ();
+$table->data[7][1] = print_select ($groups, 'id_group', $id_group, '', '', 0, true);
+//$table->data[7][1] = print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo ORDER BY nombre', "id_group", $id_group, '', 'All', 0, true);
 
 
 // Incident