diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 31233b08c3..e8b581c3be 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-24  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* godmode/agentes/module_manager_editor_common.php,
+	godmode/agentes/module_manager_editor_network.php,
+	godmode/agentes/module_manager_editor_wmi.php,
+	godmode/agentes/module_manager_editor_plugin.php,
+	godmode/agentes/module_manager_editor_prediction.php: change the lines to
+	test if the form is for policy use. And clean source code.
+
 2009-12-24  Sancho Lerena <slerena@artica.es>
 
 	* DEBIAN/postinst: Fixed some perms on postinstall.
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 4653f8637b..163755d76c 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -96,7 +96,8 @@ enterprise_include_once('include/functions_policies.php');
 $disabledBecauseInPolicy = false;
 $disabledTextBecauseInPolicy = '';
 
-if ($config['enterprise_installed'] && ($id_agent_module != 0)) {
+$page = get_parameter('page', '');
+if (strstr($page, "policy_modules") === false) {
 	$disabledBecauseInPolicy = isModuleInPolicy($id_agent_module);
 	if ($disabledBecauseInPolicy)
 		$disabledTextBecauseInPolicy = 'disabled = "disabled"';
@@ -121,8 +122,9 @@ $table_simple->data[0][2] = __('Disabled');
 $table_simple->data[0][3] = print_checkbox ("disabled", 1, $disabled, true);
 
 $table_simple->data[1][0] = __('Type').' '.print_help_icon ('module_type', true);
-if ($id_agent_module) {
-	$table_simple->data[1][1] = '<em>'.get_moduletype_description ($id_module_type).'</em>';
+if (isset($id_agent_module)) {
+	if ($id_agent_module)
+		$table_simple->data[1][1] = '<em>'.get_moduletype_description ($id_module_type).'</em>';
 }
 else {
 	$sql = sprintf ('SELECT id_tipo, descripcion
diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index 1e84f8950d..c39c30a147 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -17,7 +17,8 @@ enterprise_include_once('include/functions_policies.php');
 
 $disabledBecauseInPolicy = false;
 $disabledTextBecauseInPolicy = '';
-if ($config['enterprise_installed'] && ($id_agent_module != 0)) {
+$page = get_parameter('page', '');
+if (strstr($page, "policy_modules") === false) {
 	$disabledBecauseInPolicy = isModuleInPolicy($id_agent_module);
 	if ($disabledBecauseInPolicy)
 		$disabledTextBecauseInPolicy = 'disabled = "disabled"';
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 123801168c..d19abdcec1 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -17,7 +17,8 @@ enterprise_include_once('include/functions_policies.php');
 
 $disabledBecauseInPolicy = false;
 $disabledTextBecauseInPolicy = '';
-if ($config['enterprise_installed'] && ($id_agent_module != 0)) {
+$page = get_parameter('page', '');
+if (strstr($page, "policy_modules") === false) {
 	$disabledBecauseInPolicy = isModuleInPolicy($id_agent_module);
 	if ($disabledBecauseInPolicy)
 		$disabledTextBecauseInPolicy = 'disabled = "disabled"';
diff --git a/pandora_console/godmode/agentes/module_manager_editor_prediction.php b/pandora_console/godmode/agentes/module_manager_editor_prediction.php
index f2af17b25c..1dd32a2669 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_prediction.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_prediction.php
@@ -16,7 +16,8 @@ enterprise_include_once('include/functions_policies.php');
 
 $disabledBecauseInPolicy = false;
 $disabledTextBecauseInPolicy = '';
-if ($config['enterprise_installed'] && ($id_agent_module != 0)) {
+$page = get_parameter('page', '');
+if (strstr($page, "policy_modules") === false) {
 	$disabledBecauseInPolicy = isModuleInPolicy($id_agent_module);
 	if ($disabledBecauseInPolicy)
 		$disabledTextBecauseInPolicy = 'disabled = "disabled"';
diff --git a/pandora_console/godmode/agentes/module_manager_editor_wmi.php b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
index d477cc3e72..9e1994c79a 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_wmi.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
@@ -16,7 +16,8 @@ enterprise_include_once('include/functions_policies.php');
 
 $disabledBecauseInPolicy = false;
 $disabledTextBecauseInPolicy = '';
-if ($config['enterprise_installed'] && ($id_agent_module != 0)) {
+$page = get_parameter('page', '');
+if (strstr($page, "policy_modules") === false) {
 	$disabledBecauseInPolicy = isModuleInPolicy($id_agent_module);
 	if ($disabledBecauseInPolicy)
 		$disabledTextBecauseInPolicy = 'disabled = "disabled"';