diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index ea15e7e9b5..00b44ee261 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-22  Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/agentes/module_manager_editor_common.php: Fixed 
+	desactivation of history data when edit a policy module
+
 2012-05-22  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_reporting.php
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index be58569549..8ee91e69f2 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -204,7 +204,14 @@ $table_simple->data[3][0] = __('FF threshold').' ' . ui_print_help_icon ('ff_thr
 $table_simple->data[3][1] = html_print_input_text ('ff_event', $ff_event,
 	'', 5, 15, true, $disabledBecauseInPolicy);
 $table_simple->data[3][2] = __('Historical data');
-$table_simple->data[3][3] = html_print_checkbox ("history_data", 1, $history_data, true, $disabledBecauseInPolicy);
+if($disabledBecauseInPolicy) {
+	// If is disabled, we send a hidden in his place and print a false checkbox because HTML dont send disabled fields and could be disabled by error
+	$table_simple->data[3][3] = html_print_checkbox ("history_data_fake", 1, $history_data, true, $disabledBecauseInPolicy);
+	$table_simple->data[3][3] .= '<input type="hidden" name="history_data" value="'.(int)$history_data.'">';
+}
+else {
+	$table_simple->data[3][3] = html_print_checkbox ("history_data", 1, $history_data, true, $disabledBecauseInPolicy);
+}
 
 /* Advanced form part */
 $table_advanced->id = 'advanced';