diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 5b4d3910eb..9df40f6ffb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-08  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_alerts.php: Add always condition to templates
+
 2011-07-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* godmode/agentes/modificar_agente.php: Changed deprecated function 
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index fa227af747..144bbe7662 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -452,6 +452,7 @@ function alerts_get_alert_templates_types () {
 	$types['critical'] = __('Critical status');
 	$types['unknown'] = __('Unknown status');
 	$types['onchange'] = __('On Change');
+	$types['always'] = __('Always');
 
 	return $types;
 }