diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 3f93815a4b..eec75bfe85 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/functions_modules.php: Module name checking 
+	for invalid characters added at creation time.
+
 2013-09-16  Vanessa Gil <vanessa.gil@artica.es>
 
 	* include/languages/ar.mo
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 407ebaa70d..273c80edf8 100644
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -400,6 +400,11 @@ function modules_create_agent_module ($id_agent, $name, $values = false, $disabl
 	if (empty ($name)) {
 		return ERR_INCOMPLETE;
 	}
+		
+	// Check for non valid characters in module name
+	if (strpbrk(io_safe_output($name), '¡¿÷ºª') !==  false) {
+		return ERR_GENERIC;
+	}
 	
 	if (! is_array ($values))
 		$values = array ();