diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f90b9b785b..f67535a48a 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,17 @@
+2008-06-30  Jorge Gonzalez  <jorge.gonzalez@artica.es>
+
+	* include/help/en/help_recontask.php: Added help page for Recon tasks.
+
+	* include/languages/language_en.php: Added some strings.
+
+	* godmode/agentes/module_manager_editor_wmi.php,
+	godmode/servers/manage_recontask_form.php: Added support for inline
+	help.
+
+	* godmode/agentes/module_manager_editor_plugin.php,
+	godmode/agentes/module_manager_editor_data.php: Fixed buggy table,
+	modified previously.
+
 2008-06-30  Jorge Gonzalez  <jorge.gonzalez@artica.es>
 
 	* include/styles/pandora.css: Added cursor style for inline help.
diff --git a/pandora_console/godmode/agentes/module_manager_editor_data.php b/pandora_console/godmode/agentes/module_manager_editor_data.php
index 4c4fad7998..4ad3200945 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_data.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_data.php
@@ -103,6 +103,7 @@ echo '</tr><tr>';
 echo '<td class="datos2">'.lang_string ("module_type");
 pandora_help("module_type");
 echo '</td>';
+echo '<td class="datos2">';
 
 if ($update_module_id != NULL){
 	echo "<span class='redi'>Not available in edition mode</span>";
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index aef5eede0a..5caf5c1e52 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -140,6 +140,7 @@ echo '</tr><tr>';
 echo '<td class="datos2">'.lang_string ("module_type");
 pandora_help("module_type");
 echo '</td>';
+echo '<td class="datos2">';
 
 if ($update_module_id != NULL){
 	echo "<span class='redi'>Not available in edition mode</span>";
diff --git a/pandora_console/godmode/agentes/module_manager_editor_wmi.php b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
index 61df0abdbf..1049f68157 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_wmi.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
@@ -120,7 +120,9 @@ echo '</tr>';
 
 // module type / max timeout
 echo '</tr><tr>';
-echo '<td class="datos">'.lang_string ("module_type")."</td>";
+echo '<td class="datos">'.$lang_label["module_type"];
+pandora_help("module_type");
+echo '</td>';
 echo '<td class="datos">';
 if ($update_module_id != NULL){
 	echo "<span class='redi'>Not available in edition mode</span>";
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index 166d9c5e1a..0c94f87715 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -55,8 +55,10 @@ if (isset($_GET["update"])){ // Edit mode
 	$id_network_profile = 1;
 	$id_network_server_assigned = 0;
 }
-echo "<h2>".$lang_label["view_servers"]." &gt; ";
-echo $lang_label["manage_recontask"]."</h2>";
+echo '<h2>'.$lang_label["view_servers"].' &gt; ';
+echo $lang_label["manage_recontask"];
+pandora_help ("recontask");
+echo '</h2>';
 echo '<table width="700" cellspacing="4" cellpadding="4" class="databox_color">';
 
 // Different Form url if it's a create or if it's a update form
@@ -71,6 +73,7 @@ echo "<td class='datos2'><input type='text' name='name' size='25' value='$name'>
 //-- Recon server
 
 echo "<td class='datos2'>".$lang_label["recon_server"];
+echo '<a href="#" class="tip">&nbsp;<span>'.$lang_label["recon_server_help"].'</span></a>';
 echo "<td class='datos2'>";
 echo '<select name="id_server">';
 echo "<option value='$id_network_server'>". give_server_name($id_network_server);
@@ -120,6 +123,7 @@ while ($row=mysql_fetch_array($result))
 echo "</select></td>";
 //-- Network server
 echo "<td class='datos2'>".$lang_label["network_server"];
+echo '<a href="#" class="tip">&nbsp;<span>'.$lang_label["network_server2_help"].'</span></a>';
 echo "<td class='datos2'>";
 echo '<select name="server_assigned">';
 $sql1="SELECT id_server, name FROM tserver WHERE network_server = 1 ORDER BY name ";
diff --git a/pandora_console/include/help/en/help_recontask.php b/pandora_console/include/help/en/help_recontask.php
new file mode 100644
index 0000000000..06586b2f5e
--- /dev/null
+++ b/pandora_console/include/help/en/help_recontask.php
@@ -0,0 +1,7 @@
+<h1>Recon Task</h1>
+
+To create a Recon Task, you must fill this form. Please fill all the fields, paying special attention to <b>"Recon Server"</b> and <b>"Network Server"</b>, remember you must choose one for each, so the task will be assinged to the required servers and it will run.
+<br><br>
+"Network" refers to the network segment, and are defined using <b>CIDR</b> format. For example 192.168.1.0/24 refers to <i>all C class on 192.168.1.0</i>, wich includes all the addresses in the scope: 192.168.1.0 - 192.168.1.255.
+<br><br>
+"Network profile" are predefined profiles for the reconnaissance task. It will add such modules defined in the profile to the newly discovered machines in the network.
diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php
index 9548e67039..a010bdef02 100644
--- a/pandora_console/include/languages/language_en.php
+++ b/pandora_console/include/languages/language_en.php
@@ -691,9 +691,11 @@ $lang_label["network_component_group_management"]="Network Component group manag
 $lang_label["network_component_management"]="Network component management";
 $lang_label["oid"]="OID";
 $lang_label["recon_server"]="Recon Server";
+$lang_label["recon_server_help"]="You must select a Recon Server for the Task, otherwise the Recon Task will never run";
 $lang_label["snmp_console"]="SNMP Console";
 $lang_label["network_server"]="Network Server";
 $lang_label["network_server_help"]="You must select a Network Server for the Agent, so it can work properly with this kind of modules";
+$lang_label["network_server2_help"]="You must select a Network Server for the Task, otherwise the Recon Task will never run";
 $lang_label["data_server"]="Data Server";
 $lang_label["md5_checksum"]="MD5 Check";
 $lang_label["nc_groups"]="Component groups";