diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index b935e26cc7..63cd751c2e 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -29,9 +29,17 @@ require_once ('include/functions_servers.php');
 
 $search_string = io_safe_output(urldecode(trim(get_parameter ("search_string", ""))));
 
+global $policy_page;
+
+if (!isset($policy_page))
+	$policy_page = false;
+
 // Search string filter form
 //echo '<form id="create_module_type" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente.'">';
-echo '<form id="create_module_type" method="post" action="'.$url.'">';
+if (($policy_page) || (isset($agent)))
+	echo '<form id="" method="post" action="">';
+else
+	echo '<form id="create_module_type" method="post" action="'.$url.'">';
 echo '<table width="100%" cellpadding="2" cellspacing="2" class="databox filters" >';
 echo "<tr><td class='datos' style='width:20%; font-weight: bold;'>";
 echo __('Search') . ' ' .
@@ -41,7 +49,7 @@ echo "<td class='datos' style='width:20%'>";
 html_print_submit_button (__('Filter'), 'filter', false, 'class="sub search"');
 echo "</td>";
 echo "<td class='datos' style='width:20%'></td>";
-//echo '</form>';
+echo '</form>';
 // Check if there is at least one server of each type available to assign that
 // kind of modules. If not, do not show server type in combo
 
@@ -92,11 +100,6 @@ if (strstr($sec2, "enterprise/godmode/policies/policies") !== false) {
 	unset($modules['predictionserver']);
 }
 
-global $policy_page;
-
-if (!isset($policy_page))
-	$policy_page = false;
-
 $show_creation = false;
 
 echo "</form>";