diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6ae6c699d4..6d57b0be92 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-07  Sancho Lerena <slerena@artica.es>
+
+	* godmode/agentes/configurar_agente.php: Added custom fields to the global
+	edit/insert code. Not really used here, but for the future.
+
+	* godmode/modules/module_list.php: Show ID of modules, useful information.
+
 2010-10-07  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/javascript/calendar.js, include/javascript/jquery.colorpicker.js:
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index a2d962812d..dc4921c7f9 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -512,12 +512,15 @@ if ($update_module || $create_module) {
 	$tcp_rcv = (string) get_parameter ('tcp_rcv');
 	$tcp_port = (int) get_parameter ('tcp_port');
 
-	$custom_string_1 = "";
-	$custom_string_2 = "";
-	$custom_string_3 = "";
-	$custom_integer_1 = "";
-	$custom_integer_2 = "";
-	// Services are an enterprise feature, so we got the parameters using this function.
+	$custom_string_1 = (string) get_parameter ('custom_string_1');
+	$custom_string_2 = (string) get_parameter ('custom_string_2');
+	$custom_string_3 = (string) get_parameter ('custom_string_3');
+	$custom_integer_1 = (int) get_parameter ('custom_integer_1');
+	$custom_integer_2 = (int) get_parameter ('custom_integer_2');
+
+	// Services are an enterprise feature, 
+    // so we got the parameters using this function.
+
 	enterprise_hook ('get_service_parameters');
 	
 	$agent_name = (string) get_parameter('agent_name',get_agent_name ($id_agente));
diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php
index a2d04cdab3..7e50fb069b 100644
--- a/pandora_console/godmode/modules/module_list.php
+++ b/pandora_console/godmode/modules/module_list.php
@@ -51,6 +51,7 @@ if ($update_module) {
 
 echo "<table cellpadding='4' cellspacing='4' width='750' class='databox'>";
 echo "<th>".__('Icon')."</th>";
+echo "<th>".__('ID')."</th>";
 echo "<th>".__('Name')."</th>";
 echo "<th>".__('Description')."</th>";
 $sql = 'SELECT * FROM ttipo_modulo ORDER BY nombre';
@@ -71,6 +72,9 @@ while ($row = mysql_fetch_array ($result)){
 		border='0'>
 		</td>
 		<td class='$tdcolor'>
+		<b>".$row[0]."
+		</b></td>
+		<td class='$tdcolor'>
 		<b>".$row["nombre"]."
 		</b></td>
 		<td class='$tdcolor'>