diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 1b446e55b5..013abeec69 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-05 Javier Lanz <javier.lanz@artica.es>
+
+	* godmode/tag/edit_tag.php: Fixed blank names creating & updating
+	tags
+
+	Fixes: #3371409
+
 2011-08-04 Javier Lanz <javier.lanz@artica.es>
 
 	* godmode/setup/links.php: Fixed blank names creating & updating links
diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php
index 21b176d13b..0d46d97726 100644
--- a/pandora_console/godmode/tag/edit_tag.php
+++ b/pandora_console/godmode/tag/edit_tag.php
@@ -57,7 +57,9 @@ if ($update_tag && $id_tag != 0) {
 	$values['description'] = $description_tag;
 	$values['url'] = $url_tag;
 	
-	$result = tags_update_tag($values, 'id_tag = ' . $id_tag);
+	$result = false;
+	if ($values['name'] != '')
+		$result = tags_update_tag($values, 'id_tag = ' . $id_tag);
 	
 	if ($result === false) {
 		echo '<h3 class="error">'.__('Error updating tag').'</h3>';
@@ -80,7 +82,9 @@ if ($create_tag) {
 	$data['url'] = $url_tag;
 	
 	// DB insert
-	$return_create = tags_create_tag ($data);
+	$return_create = false;
+	if ($data['name'] != '')
+		$return_create = tags_create_tag ($data);
 
 	if ($return_create === false) {
 		echo '<h3 class="error">'.__('Error creating tag').'</h3>';