diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 0bc4c4ed17..8c420ad9dd 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-20  Sergio Martin <sergio.martin@artica.es>
+
+	* lib/PandoraFMS/Tools.pm: Fixed mistake in the last commit
+	adding parameter in wrong function (decode embed decode).
+
 2011-10-20  Sergio Martin <sergio.martin@artica.es>
 
 	* lib/PandoraFMS/Tools.pm: Fixed safe_input and output to
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 285b39bf2c..b8bfc3a18e 100644
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -90,7 +90,7 @@ sub pandora_trash_ascii {
 sub safe_input($) {
 	my $value = shift;
 
-	$value = encode_entities ($value);
+	$value = encode_entities ($value, "'<>&");
 		
 	#//Replace the character '\' for the equivalent html entitie
 	$value =~ s/\\/&#92;/gi;
@@ -137,7 +137,7 @@ sub safe_input($) {
 sub safe_output($) {
 	my $value = shift;
 
-	$value = decode_entities ($value, "'<>&");
+	$value = decode_entities ($value);
 		
 	#//Replace the character '\' for the equivalent html entitie
 	$value =~ s/&#92;/\\/gi;