diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d679df2647..9a6d1bced5 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-26  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_menu.php
+	operation/agentes/estado_agente.php: Add a manually list of the
+	pages (sec2) not accessibles from menu to link it to the
+	section where appear (sec). Fix a bad section
+	Merged from 4.0.2
+
 2012-09-25 Miguel de Dios <miguel.dedios@artica.es>
 
 	* general/login_page.php, general/logoff.php, general/header.php,
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 7111bebff2..ff2ea88987 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -339,9 +339,60 @@ function menu_get_full_sec() {
 	
 	unset($menu['class']);
 	
+	menu_add_extras($menu);
+	
 	return $menu;
 }
 
+/**
+ * Build an extra access pages array and merge it with menu
+ *
+ * @param menu array (pass by reference)
+ * 
+ */
+function menu_add_extras(&$menu) {
+	$menu_extra = array();
+	$menu_extra['gusuarios']['sub']['godmode/users/configure_user']['text'] = __('Configure user');
+	$menu_extra['gusuarios']['sub']['godmode/users/configure_profile']['text'] = __('Configure profile');
+	$menu_extra['gservers']['sub']['godmode/servers/manage_recontask_form']['text'] = __('Manage recontask');
+	$menu_extra['gmodules']['sub']['godmode/modules/manage_network_templates_form']['text'] = __('Module templates management');
+	$menu_extra['gmodules']['sub']['enterprise/godmode/modules/manage_inventory_modules_form']['text'] = __('Inventory modules management');
+	$menu_extra['gmodules']['sub']['godmode/tag/edit_tag']['text'] = __('Tags management');
+	$menu_extra['gagente']['sub']['godmode/agentes/configurar_agente']['text'] = __('Agents management');
+	$menu_extra['estado']['sub']['operation/agentes/ver_agente']['text'] = __('View agent');
+	$menu_extra['galertas']['sub']['godmode/alerts/configure_alert_template']['text'] = __('Configure alert template');
+	$menu_extra['network']['sub']['operation/agentes/networkmap']['text'] = __('Manage network map');
+	$menu_extra['reporting']['sub']['operation/reporting/reporting_viewer']['text'] = __('View reporting');
+	$menu_extra['reporting']['sub']['operation/visual_console/render_view']['text'] = __('View visual console');
+	$menu_extra['reporting']['sub']['godmode/reporting/graph_builder']['text'] = __('Manage custom graphs');
+	$menu_extra['reporting']['sub']['enterprise/dashboard/dashboard_replicate']['text'] = __('Copy dashboard');
+	$menu_extra['godgismaps']['sub']['godmode/gis_maps/configure_gis_map']['text'] = __('Manage GIS Maps');
+	$menu_extra['workspace']['sub']['operation/incidents/incident_statistics']['text'] = __('Incidents statistics');
+	$menu_extra['workspace']['sub']['operation/messages/message_edit']['text'] = __('Manage messages');
+	$menu_extra['gagente']['sub']['godmode/groups/configure_group']['text'] = __('Manage groups');
+	$menu_extra['gagente']['sub']['godmode/groups/configure_modu_group']['text'] = __('Manage module groups');
+	$menu_extra['gagente']['sub']['godmode/agentes/configure_field']['text'] = __('Manage custom field');
+	$menu_extra['galertas']['sub']['godmode/alerts/configure_alert_action']['text'] = __('Manage alert actions');
+	$menu_extra['galertas']['sub']['godmode/alerts/configure_alert_command']['text'] = __('Manage commands');
+	$menu_extra['galertas']['sub']['godmode/alerts/configure_alert_compound']['text'] = __('Manage compound alerts');
+	$menu_extra['galertas']['sub']['enterprise/godmode/alerts/alert_events']['text'] = __('Manage event alerts');
+	$menu_extra['gservers']['sub']['enterprise/godmode/servers/manage_export_form']['text'] = __('Manage export targets');
+	
+	// Duplicate extensions as sec=extension to check it from url
+	foreach ($menu as $k => $m) {
+		if(!isset($m['sub'])) {
+			continue;
+		}
+		foreach($m['sub'] as $kk => $mm) {
+			if(isset($mm['sec'])) {
+				$menu_extra[$mm['sec']]['sub'][$kk]['text'] = $mm['text'];
+			}
+		}
+	}	
+
+	$menu = array_merge_recursive($menu, $menu_extra);
+}
+
 /**
  * Get the sec list built in menu
  *
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 405e3560a4..83ceef8e70 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -217,7 +217,7 @@ html_print_submit_button (__('Search'), "srcbutton", '', array ("class" => "sub
 echo '</td><td style="width:5%;">&nbsp;</form></td>';
 
 echo '<td>';
-echo '<form method="post" action="index.php?sec=estado&sec2=godmode/agentes/configurar_agente">';
+echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
 	html_print_input_hidden ('new_agent', 1);
 	html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
 echo "</form>";