diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 9818290ac5..96e89ce8e3 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-18 Javier Lanz <javier.lanz@artica.es>
+	* godmode/gis_maps/configure_gis_map.php: Adding layer, group combo only
+	displays user's groups.
+
 2011-02-18 Javier Lanz <javier.lanz@artica.es>
 	* godmode/gis_maps/configure_gis_map.php: Group combo now only displays
 	user's groups.
diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index fca26e3c98..d5e740e69c 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -339,7 +339,7 @@ if ($own_info['is_admin'] || give_acl ($config['id_user'], 0, "PM"))
 else
 	$display_all_group = false;
 $table->data[2][0] = __('Group') . print_help_tip (__('Group that owns the map'), true). ':';
-$table->data[2][1] = print_select_groups(false, 'AW', $display_all_group, 'map_group_id', $map_group_id, '', '', '', true);
+$table->data[2][1] = print_select_groups(false, 'IW', $display_all_group, 'map_group_id', $map_group_id, '', '', '', true);
 
 $table->data[3][0] = __('Default zoom') . print_help_tip (__('Default zoom level when opening the map'), true). ':';
 $table->data[3][1] = print_input_text ('map_zoom_level', $map_zoom_level, '', 2, 4, true) . print_input_hidden('map_levels_zoom', $map_levels_zoom, true);
@@ -387,7 +387,7 @@ $table->data[1][1] = '<div id="form_layer">
 			</tr>
 			<tr>
 				<td>' . __('Show agents from group') . ':</td>
-				<td colspan="3">' . print_select_groups(false, false, true, 'layer_group_form', '-1', '', __('None'), '-1', true) . '</td>
+				<td colspan="3">' . print_select_groups(false, 'IW', $display_all_group, 'layer_group_form', '-1', '', __('None'), '-1', true) . '</td>
 			</tr>
 			<tr>
 				<td colspan="4"><hr /></td>