diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 5ae9f298cb..f59209d873 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-27  Ramon Novoa  <rnovoa@artica.es>
+
+	* operation/events/events_list.php: Hide agent details unless we have
+	  a valid agent id.
+
 2011-07-27  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/agentes/configurar_agente.php: Fixed bad parameters 
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index b5928a711d..4dc91e60bd 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -557,11 +557,13 @@ foreach ($result as $event) {
 	$string .= '<b>' . __('Type') . '</b></td><td align="left">';
 	$string .= events_print_type_img ($event["event_type"], true).' '.events_print_type_description($event["event_type"], true);
 	$string .= '</td></tr><tr>';
-	$string .= '<td align="left" valign="top" width="15%">';
-	$string .= '<b>' . __('Agent name') . '</b></td><td align="left">';
-	$string .= ui_print_agent_name ($event["id_agente"], true);
-	$string .= '</td></tr><tr>';
 	
+	if ($event["id_agente"] != 0) {
+		$string .= '<td align="left" valign="top" width="15%">';
+		$string .= '<b>' . __('Agent name') . '</b></td><td align="left">';
+		$string .= ui_print_agent_name ($event["id_agente"], true);
+		$string .= '</td></tr><tr>';
+	}
 	
 	if ($event["id_agentmodule"] != 0) {
 		$string .= '<td align="left" valign="top" width="15%">';