diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 92cab197b0..deaf656999 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-16  Vanessa Gil  <vanessa.gil@artica.es>
+	* include/functions_events.php 
+	  operation/events/events_list: In event list: display always user name, 
+	changed buttons, changed event type.
+
 2012-02-16  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/alerts/alert_list.builder.php: Fixed creation alerts 
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 0ce9ebe7a1..a8ad3fb78f 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -631,6 +631,15 @@ function events_print_type_description ($type, $return = false) {
 	case "new_agent";
 		$output .= __('New agent created');
 		break;
+	case "configuration_change";
+		$output .= __('Configuration change');
+		break;
+	case "alert_ceased";
+		$output .= __('Alert ceased');
+		break;
+	case "error";
+		$output .= __('Error');
+		break;
 	case "unknown": 
 	default:
 		$output .= __('Unknown type:').': '.$type;
@@ -769,6 +778,8 @@ function events_get_event_types ($type_id){
 				break;
 		case 'error': $type_desc = __('Error');
 				break;
+		case 'configuration_change': $type_desc = __('Configuration change');
+				break;
 		case 'not_normal': $type_desc = __('Not normal');
 				break;
 		default:
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index b6c69742a5..731d589bf5 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -19,6 +19,7 @@ global $config;
 
 require_once ("include/functions_events.php"); //Event processing functions
 require_once ("include/functions_alerts.php"); //Alerts processing functions
+require_once ("include/functions.php");
 require_once($config['homedir'] . "/include/functions_agents.php"); //Agents funtions
 require_once($config['homedir'] . "/include/functions_users.php"); //Users functions
 require_once ($config['homedir'] . '/include/functions_groups.php');
@@ -701,10 +702,8 @@ foreach ($result as $event) {
 	
 	if (in_array('id_agente', $show_fields)) {
 		$data[$i] = '<span style="color: #000000">';
-		if ($event["event_type"] == "system") {
-			$data[$i] .= __('System');
-		}
-		elseif ($event["id_agente"] > 0) {
+		
+		if ($event["id_agente"] > 0) {
 			// Agent name
 			$data[$i] .= ui_print_agent_name ($event["id_agente"], true);
 		}
@@ -860,7 +859,7 @@ foreach ($result as $event) {
 		
 	$string .= '<a class="validate_event" href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">';
 		
-	$string .= html_print_button (__('Change status'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
+	$string .= html_print_button (__('Update'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
 	$string .= '</a>';
 	$string .= '</td><td width="400px">';
 	if($event["id_alert_am"] != 0) {
@@ -1087,7 +1086,7 @@ foreach ($result as $event) {
 	$odd = ($odd == '')? 'rowOdd' : '';
 	
 	$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('User name') . '</td><td align="left">';
-	if ($event["id_usuario"]!= '0') {
+	if ($event["id_usuario"]!= 0) {
 		$string .= $event["id_usuario"];
 	} 
 	else {
@@ -1120,7 +1119,7 @@ if (!empty ($table->data)) {
 
 	echo '<div style="width:'.$table->width.';" class="action-buttons">';
 	if (check_acl ($config["id_user"], 0, "IW") == 1) {
-		html_print_submit_button (__('Change status'), 'validate_btn', false, 'class="sub ok"');
+		html_print_submit_button (__('Update'), 'validate_btn', false, 'class="sub ok"');
 	}
 	if (check_acl ($config["id_user"], 0,"IM") == 1) {