diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index e3505693fd..d8a8a83d69 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* godmode/agentes/module_manager_editor_common.php: added code to
+	policy module editor with disabled unknown events modules.
+
 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* include/functions_modules.php: fixed the massive copy modules
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index c68360ef40..16b5682bb1 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -345,9 +345,20 @@ $table_advanced->data[4][1] = html_print_select_from_sql ('SELECT id, name FROM
 	'id_export', $id_export, '', $none_text, '0', true, false, false, $disabled_export).ui_print_help_tip (__('In case you use an Export server you can link this module and export data to one these.'), true);
 $table_advanced->colspan[4][1] = 2;
 
+// Code comes from module_editor
+if ($__code_from == 'modules') {
+	$throw_unknown_events_check =
+		!modules_is_disable_type_event($id_agent_module, EVENTS_GOING_UNKNOWN);
+}
+else {
+	global $__id_pol_mod;
+	
+	$throw_unknown_events_check =
+		!policy_module_is_disable_type_event($__id_pol_mod, EVENTS_GOING_UNKNOWN);
+}
 $table_advanced->data[4][3] = __('Throw unknown events');
 $table_advanced->data[4][4] = html_print_checkbox('throw_unknown_events',
-	1, !modules_is_disable_type_event($id_agent_module, EVENTS_GOING_UNKNOWN), true);
+	1, $throw_unknown_events_check, true);
 
 $table_advanced->data[5][0] = __('Unit');
 $table_advanced->data[5][1] = html_print_input_text ('unit', $unit,