diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d502a96cad..3bf0d21d82 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-27  Junichi Satoh  <junichi@rworks.jp>
+
+	* godmode/agents/module_manager_editor.php: Changed if() statements
+	order. isModuleInPolicy() is not available in open source version.
+
 2010-08-26  Sancho Lerena  <slerena@gmail.com>
 
     * include/functions_custom_graphs.php: Fixed ACL problems.
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index a218b25ac4..6574a2f56a 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -282,8 +282,8 @@ if (isset ($extra_title))
 	echo ' - '.$extra_title;
 echo '</h3>';
 
-if (isModuleInPolicy($id_agent_module)) {
-	if($config['enterprise_installed']) {
+if($config['enterprise_installed']) {
+	if (isModuleInPolicy($id_agent_module)) {
 		add_policy_linkation($id_agent_module);
 	}
 }