diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index b09ee10221..779d3cabc5 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-20  Esteban Sanchez  <estebans@artica.es>
+
+	* godmode/alerts/configure_alert_template.php: Fixed an error when
+	setting max and min values on template creation.
+
+	* godmode/menu.php: Default action on "Manage alerts" is showing the
+	templates now.
+
 2009-01-20  Sancho Lerena <slerena@artica.es>
 
 	* install.php: Added ldap module dep.
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index f333bea0bc..170611055d 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -105,7 +105,7 @@ function print_alert_template_example ($id, $return = false) {
 			$output .= __('The alert would fire when the value is <span id="value"></span>');
 			break;
 		case 'equal':
-		/* Do not translate the HTML attributes */
+			/* Do not translate the HTML attributes */
 			$output .= __('The alert would fire when the value is not <span id="value"></span>');
 			break;
 		case 'regex':
@@ -285,8 +285,8 @@ if ($create_template) {
 	$result = create_alert_template ($name, $type,
 		array ('description' => $description,
 			'value' => $value,
-			'max' => $max,
-			'min' => $min));
+			'max_value' => $max,
+			'min_value' => $min));
 	
 	print_error_message ($result, __('Successfully created'),
 		__('Could not be created'));
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 53517810c9..9df6a814a4 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -61,7 +61,7 @@ if (give_acl ($config['id_user'], 0, "PM")) {
 
 if (give_acl ($config['id_user'], 0, "LM")) {
 	$menu["galertas"]["text"] = __('Manage alerts');
-	$menu["galertas"]["sec2"] = "godmode/alerts/modify_alert";
+	$menu["galertas"]["sec2"] = "godmode/alerts/alert_templates";
 	$menu["galertas"]["id"] = "god-alerts";
 	
 	$sub = array ();