diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 272feead0c..f239dc3203 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-29  Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/agentes/module_manager_editor.php: Fixe module editor when the
+	data configuration textarea is empty or is a module plugin
+
 2011-12-23  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/functions_servers.php: Added Netflow server information.
@@ -13,6 +18,17 @@
 	
 	Fixes: #3453610
 
+2011-12-22  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_graph.php
+	include/graphs/functions_pchart.php
+	include/graphs/fgraph.php
+	include/graphs/functions_utils.php: Improve the static
+	graphs
+
+	* operation/search_modules.php: Fix the interval
+	column of the global modules search
+
 2011-12-22  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_graph.php: Fixed Date formats in graph
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index 4005f00e98..9cce3be095 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -410,8 +410,10 @@ $(document).ready (function () {
 			remote_config = $("#textarea_configuration_data").val();
 
 			regexp_name = new RegExp('module_name\\s*' + name+"\n");
-
-			if (remote_config.match(regexp_name) || $("#id_module_type").val()==100 || $("#hidden-id_module_type_hidden").val()==100) return true;
+			
+			regexp_plugin = new RegExp('^module_plugin\\s*');
+			
+			if (remote_config == '' || remote_config.match(regexp_name) || remote_config.match(regexp_plugin) || $("#id_module_type").val()==100 || $("#hidden-id_module_type_hidden").val()==100) return true;
 			else {
 				alert("<?php echo __("Error, The field name and name in module_name in data configuration are different.");?>");
 				return false;