diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 6b91bf9b85..fb5007b24d 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-08  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Use commas to separate tags.
+
 2011-06-08  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/DB.pm: Added a function to get the name of an alert
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index c4a9ff3ba8..af51e89b19 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2435,12 +2435,15 @@ sub pandora_get_module_tags ($$$) {
 	
 	# No tags found
 	return '' if ($#tags < 0);
-	
-	my $tag_string = '|';
+
+	my $tag_string = '';
 	foreach my $tag (@tags) {
-		$tag_string .=  $tag->{'name'} . '|';
+		$tag_string .=  $tag->{'name'} . ',';
 	}
 	
+	# Remove the trailing ','
+	chop ($tag_string);
+	
 	return $tag_string;
 }