diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 179b330456..2a4cf88547 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* godmode/alerts/configure_alert_template.php: Fixed template 
+	update. Thank you to Manuel Arostegui for the patch!
+
 2011-11-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* operation/snmpconsole/snmp_view.php: Added new free search and
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index 5c56568033..ec7f5590ea 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -190,12 +190,7 @@ function update_template ($step) {
 				'matches_value' => $matches,
 				'priority' => $priority);
 
-		if (!$name || $name_check) {
-			$result = '';
-		}
-		else {
-			$result = alerts_update_alert_template ($id,$values);
-		}
+		$result = alerts_update_alert_template ($id,$values);
 	}
 	elseif ($step == 2) {
 		$monday = (bool) get_parameter ('monday');