diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 0827f30d44..1d70357d86 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-12  Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/agentes/module_manager_editor_plugin.php
+	godmode/agentes/configurar_agente.php: Fixed two notices
+	in the module creation
+
 2012-09-12  Vanessa Gil <vanessa.gil@artica.es>
 
 	* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 776d479f13..b248e226de 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -693,6 +693,7 @@ if ($update_module || $create_module) {
 	$tcp_port = (int) get_parameter ('tcp_port');
 	$configuration_data = (string) get_parameter ('configuration_data');
 	$old_configuration_data = (string) get_parameter ('old_configuration_data');
+	$new_configuration_data = '';
 	
 	$custom_string_1 = (string) get_parameter ('custom_string_1');
 	$custom_string_2 = (string) get_parameter ('custom_string_2');
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 59ff435ab3..fa771bd602 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -15,6 +15,8 @@
 
 enterprise_include_once('include/functions_policies.php');
 
+global $module;
+
 $macros = $module['macros'];
 
 $disabledBecauseInPolicy = false;