diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6bd5241c94..9f56ecc599 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-23  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* godmode/modules/manage_network_components_form.php: add comments for
+	clarify mecanics of code, and add default group when choose make new
+	WMI.
+	* godmode/modules/manage_network_components_form_wmi.php: fix the bug,
+	change files to add the html table, it was a probably typing mistake.
+	Fixes: 2808211
+
 2009-07-22  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* operation/agentes/tactical.php: fix bug, and now show another column
diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php
index be76190f0e..df6ac805ef 100644
--- a/pandora_console/godmode/modules/manage_network_components_form.php
+++ b/pandora_console/godmode/modules/manage_network_components_form.php
@@ -68,7 +68,8 @@ if (isset ($id)) {
 		$tcp_send = "";
 		$snmp_community = "";
 		$id_module_group = "";
-		$id_group = "";
+		if ($id_component_type == 6) $id_group = 14;
+		else $id_group = "";
 		$type = 0;
 		$min_warning = 0;
 		$max_warning = 0;
@@ -79,6 +80,16 @@ if (isset ($id)) {
 	}
 }
 
+/**
+ * $id_component_type has these values:
+ * 6 - Module WMI
+ * 4 - Plugin component
+ * 2 - network component
+ * 
+ * You can see this values in file godmode/modules/manage_network_components.php
+ * in the last lines (in the call function "print_select").
+ */
+
 if ($id_component_type == 6) {
 	$categories = array (0, 1, 2);
 	require ("godmode/modules/manage_network_components_form_common.php");
diff --git a/pandora_console/godmode/modules/manage_network_components_form_wmi.php b/pandora_console/godmode/modules/manage_network_components_form_wmi.php
index 576fa6b67e..4b6d5af229 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_wmi.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_wmi.php
@@ -51,7 +51,7 @@ $data[1] = print_input_text ('plugin_user', $plugin_user, '', 15, 255, true);
 $data[2] = __('Password');
 $data[3] = print_input_password ('plugin_pass', $plugin_pass, '', 25, 255, true);
 
-push_table_row ($data, 'wmi_2');
+push_table_row ($data, 'wmi_3');
 
 return;
 // Update an existing component