diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 1ae15bc64a..f48afebc90 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-11  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* godmode/agentes/configurar_agente.php: fix bug for character "`" in
+	name also in description, translate to html entitie.
+	Fixes: 2838129
+
 2009-09-11  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* godmode/alerts/alert_list.php: fix bug in "Alerts » Manage alerts" when
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index e943b7a2e6..2cd3b70342 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -261,7 +261,7 @@ if (isset( $_GET["fix_module"])) {
 // Update AGENT
 if (isset($_POST["update_agent"])) { // if modified some agent paramenter
 	$id_agente = (int) get_parameter_post ("id_agente");
-	$nombre_agente = (string) get_parameter_post ("agente", "");
+	$nombre_agente = str_replace('`','&lsquo;',(string) get_parameter_post ("agente", ""));
 	$direccion_agente = (string) get_parameter_post ("direccion", '');
 	$address_list = (string) get_parameter_post ("address_list", '');
 	if ($address_list != $direccion_agente && $direccion_agente == get_agent_address ($id_agente) && $address_list != get_agent_address ($id_agente)) {
@@ -274,7 +274,7 @@ if (isset($_POST["update_agent"])) { // if modified some agent paramenter
 	}
 	$grupo = (int) get_parameter_post ("grupo", 0);
 	$intervalo = (int) get_parameter_post ("intervalo", 300);
-	$comentarios = (string) get_parameter_post ("comentarios", "");
+	$comentarios = str_replace('`','&lsquo;',(string) get_parameter_post ("comentarios", ""));
 	$modo = (bool) get_parameter_post ("modo", 0); //Mode: Learning or Normal
 	$id_os = (int) get_parameter_post ("id_os");
 	$disabled = (bool) get_parameter_post ("disabled");