diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6566002b2f..a8de36447d 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-27  Sancho Lerena  <slerena@artica.es>
+
+	* godmode/agentes/alert_manager.php: Now alert edit/create uses
+	alert tab to show alert data.
+	
 2007-05-27  Raul Mateos  <raulofpandora@gmail.com>
 
 	* include/styles/pandora.css: Cleaned and moved install styles
diff --git a/pandora_console/godmode/agentes/alert_manager.php b/pandora_console/godmode/agentes/alert_manager.php
index f79f80c316..dcd29d379f 100644
--- a/pandora_console/godmode/agentes/alert_manager.php
+++ b/pandora_console/godmode/agentes/alert_manager.php
@@ -125,7 +125,7 @@ $result=mysql_query($sql1);
 // ==================================================================================
 // Add alerts
 // ==================================================================================
-echo '<form name="agente" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'">';
+echo '<form name="agente" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente='.$id_agente.'">';
 if (! isset($update_alert))
 	$update_alert = -1;
 if ($update_alert != 1) {
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index d6d56be52a..fc05c54284 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -242,7 +242,6 @@ if (isset($_POST["insert_alert"])){ // if created alert
 			 '$max_alerts',
 			 '$min_alerts',
 			 '$alert_text')";
-
 	$result=mysql_query($sql_insert);	
 	if (! $result)
 		echo "<h3 class='error'>".$lang_label["create_alert_no"]."</h3>";