diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f94aed55e5..7193cea953 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* godmode/tag/edit_tag.php: Comma characters are erased 
+	during tag creation/update.
+
 2011-06-08  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandoradb.sql: Added support for event tags.
diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php
index 45b099557e..711bbbf912 100644
--- a/pandora_console/godmode/tag/edit_tag.php
+++ b/pandora_console/godmode/tag/edit_tag.php
@@ -48,6 +48,10 @@ ui_print_page_header (__('Tags configuration'), "images/comments.png", false, ""
 // Two actions can performed in this page: update and create tags
 // Update tag: update an existing tag
 if ($update_tag && $id_tag != 0) {	
+
+	// Erase comma characters on tag name
+	$name_tag = str_replace(',', '', $name_tag); 
+
 	$values = array();
 	$values['name'] = $name_tag;
 	$values['description'] = $description_tag;
@@ -67,6 +71,9 @@ if ($create_tag) {
 
 	$return_create = true;
 	
+	// Erase comma characters on tag name
+	$name_tag = str_replace(',', '', $name_tag); 
+	
 	$data = array();
 	$data['name'] = $name_tag;
 	$data['description'] = $description_tag;