diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 84982a3c27..eaa7820905 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-13  Sergio Martin <sergio.martin@artica.es>
+
+	* util/pandora_manage.pl: Fixed entities trouble in the action
+	exist check
+
 2012-04-12  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/DB.pm,
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5e8c155f83..0c033f3ad5 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -1475,7 +1475,7 @@ sub cli_create_template_action() {
 	exist_check($template_id,'template',$template_name);
 	my $template_module_id = get_template_module_id($dbh,$module_id,$template_id);
 	exist_check($template_module_id,'template module',$template_name);
-	my $action_id = get_action_id($dbh,$action_name);
+	my $action_id = get_action_id($dbh,safe_input($action_name));
 	exist_check($action_id,'action',$action_name);
 	
 	$fires_min = 0 unless defined ($fires_min);
@@ -1509,7 +1509,7 @@ sub cli_delete_template_action() {
 	exist_check($template_id,'template',$template_name);
 	my $template_module_id = get_template_module_id($dbh,$module_id,$template_id);
 	exist_check($template_module_id,'template module',$template_name);
-	my $action_id = get_action_id($dbh,$action_name);
+	my $action_id = get_action_id($dbh,safe_input($action_name));
 	exist_check($action_id,'action',$action_name);
 
 	pandora_delete_template_module_action ($dbh, $template_module_id, $action_id);