diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index fbc5bc9609..43eee34651 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-11  Vanessa Gil  <vanessa.gil@artica.es>
+
+	* godmode/agentes/module_manager_editor.php
+	include/javascript/pandora_modules.js: Fixed bug: Is possible to create a module plugin without module associated.
+
 2011-05-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/functions_io.php
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index eb58b40967..3f6d944ebe 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -362,6 +362,7 @@ var no_name_lang = "<?php echo __('No module name provided') ?>";
 var no_target_lang = "<?php echo __('No target IP provided') ?>";
 var no_oid_lang = "<?php echo __('No SNMP OID provided') ?>";
 var no_prediction_module_lang = "<?php echo __('No module to predict') ?>";
+var no_plugin_lang = "<?php echo __('No plug-in provided') ?>";
 
 $(document).ready (function () {
 	configure_modules_form ();
diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index ddd6570775..a6c2d69e43 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -303,6 +303,12 @@ function configure_modules_form () {
 			return false;
 		}
 		
+		if ($("#id_plugin").attr ("value") == 0) {
+			$("#id_plugin").focus ();
+			$("#message").showMessage (no_plugin_lang);
+			return false;
+		}
+
 		moduletype = $("#hidden-moduletype").val ();
 		if (moduletype == 5) {
 			if ($("#prediction_module").val () == null) {