diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 653a38a273..afbd1e76d3 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-16 Pablo de la Concepción <pablo.concepcion@artica.es>
+
+    * include/ajax/agent.php: Modified to return the agent name at the i
+    begining of the serialized result.
+
+	* godmode/agentes/configurar_agente.php: Added help links and TODO tag
+	to remember to change the tabs to use the print_page_header function.
+
 2010-04-15 Sergio Martin <sergio.martin@artica.es>
 
         * godmode/users/configure_user.php: fixed bug 2987162. Validation 
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 13e0b7519b..e2d9d20ae2 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -195,11 +195,13 @@ if ($create_agent) {
 // Show tabs
 $img_style = array ("class" => "top", "width" => 16);
 
+// TODO: Change to use print_page_header
 if ($id_agente) {
 	echo '<div id="menu_tab_frame"><div id="menu_tab_left"><ul class="mn">';
 	echo '<li class="nomn"><a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'">';
 	print_image ("images/setup.png", false, $img_style);
 	echo '&nbsp; '.mb_substr(get_agent_name ($id_agente), 0, 21) .'</a>';
+	echo '&nbsp;<img src="images/help.png" class="img_help" title="'.__('Help').'" onclick="open_help(\'agent_manager\')" alt="'.__('Help').'">';
 	echo "</li></ul></div>";
 
 	echo '<div id="menu_tab"><ul class="mn"><li class="nomn">';
@@ -250,7 +252,7 @@ if ($id_agente) {
 // Create agent 
 else {
 
-	print_page_header (__('Agent manager'), "images/bricks.png", false, "", true);
+	print_page_header (__('Agent manager'), "images/bricks.png", false, "create_agent", true);
 
 }
 
diff --git a/pandora_console/include/ajax/agent.php b/pandora_console/include/ajax/agent.php
index 307c4f2775..0e1fb06a86 100644
--- a/pandora_console/include/ajax/agent.php
+++ b/pandora_console/include/ajax/agent.php
@@ -48,7 +48,7 @@ if ($search_agents) {
         return;
 
     foreach ($agents as $agent) {
-        echo $agent['id_agente']."|".$agent['nombre']."|".$agent['direccion']."\n";
+        echo $agent['nombre']."|".$agent['id_agente']."|".$agent['direccion']."\n";
     }
 
     return;