diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index eb751d1a51..8831fc29eb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* godmode/agentes/module_manager_editor_common.php: Removed entities
+	from agent name.
+	
+	Fixes: #3437885
+
 2011-11-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* godmode/servers/manage_recontask.php
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 97b46cda14..73080ff3f4 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -123,7 +123,7 @@ $table_simple->style[1] = 'width: 40%';
 $table_simple->style[2] = 'font-weight: bold; vertical-align: top';
 
 $table_simple->data[0][0] = __('Name');
-$table_simple->data[0][1] = html_print_input_text ('name', $name, '', 50, 100, true, $disabledBecauseInPolicy);
+$table_simple->data[0][1] = html_print_input_text ('name', io_safe_output($name), '', 50, 100, true, $disabledBecauseInPolicy);
 $table_simple->data[0][2] = __('Disabled');
 $table_simple->data[0][3] = html_print_checkbox ("disabled", 1, $disabled, true);