diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index bc93042bb0..d482e55db3 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-31  Sergio Martin <sergio.martin@artica.es>
+
+	* operation/events/export_csv.php: Fixed ACLs to avoid
+	to export system events to not administrators for bug 
+	3053486
+
 2010-08-31  Raúl Mateos   <raulofpandora@gmail.com>
 
 	* godmode/reporting/reporting_builder.php,
diff --git a/pandora_console/operation/events/export_csv.php b/pandora_console/operation/events/export_csv.php
index 3177683fc1..6d1f6de827 100644
--- a/pandora_console/operation/events/export_csv.php
+++ b/pandora_console/operation/events/export_csv.php
@@ -71,14 +71,15 @@ $sql = get_db_all_rows_filter ('tevento', $filter, $fields, 'AND', true, true);
 $new = true;
 while ($event = get_db_all_row_by_steps_sql($new, $result, $sql)) {
 	$new = false;
-	if (! give_acl ($config["id_user"], $event["id_grupo"], "AR"))
+	if (!check_acl($config["id_user"], $event["id_grupo"], "AR") ||
+	(!check_acl($config["id_user"], 0, "PM") && $event["event_type"] == 'system'))
 		continue;
 	
 	echo $event["timestamp"];
 	echo ",";
-	echo get_db_value ('nombre', 'tagente', 'id_agente', $event["id_agente"]);
+	echo get_agent_name($event["id_agente"]);
 	echo ",";
-	echo get_db_value ('nombre', 'tgrupo', 'id_grupo', $event["id_grupo"]);
+	echo get_group_name($event["id_grupo"]);
 	echo ",";
 	echo $event["evento"];
 	echo ",";