diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d6824905e2..d69b2dd597 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-21  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* operation/agentes/estado_generalagente.php: added the style for disabled
+	agent and tooltip, in the name agent.
+	
+	* operation/search_results.php: added the style for disabled
+	agent and tooltip.
+	
+	* godmode/agentes/modificar_agente.php: added tooltip.
+
 2010-05-20 Raúl Mateos <raulofpandora@gmail.com>
 
 	* godmode/alerts/alert_list.php: Added code to show different
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 20f0f8a77a..5b75c48ca7 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -198,6 +198,7 @@ if ($agents !== false) {
 		sec2=godmode/agentes/configurar_agente&tab=main&
 		id_agente=".$agent["id_agente"]."'>".$agent["nombre"]."</a></strong>";
 		if ($agent["disabled"]) {
+			print_help_tip(__('Disabled'));
 			echo "</em>";
 		}
 		echo '</span><div class="left actions" style="visibility: hidden; clear: left">';
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 306384dc2d..6a80bf14c4 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -68,7 +68,13 @@ echo '<div width="450px">';
 echo '<table cellspacing="4" cellpadding="4" border="0" class="databox">';
 //Agent name
 echo '<tr><td class="datos"><b>'.__('Agent name').'</b></td>';
-echo '<td class="datos"><b>'.$agent["nombre"].'</b></td>';
+if ($agent['disabled']) {
+	$cellName = "<em>" . print_agent_name ($agent["id_agente"], true, "upper") .print_help_tip(__('Disabled'), true) . "</em>";
+}
+else {
+	$cellName = print_agent_name ($agent["id_agente"], true, "upper");
+}
+echo '<td class="datos"><b>'.$cellName.'</b></td>';
 echo '<td class="datos" width="40"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&refr=60"><img src="images/refresh.png" border="0" title="'.__('Refresh data').'" /></a>&nbsp;';
 echo '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&flag_agent=1&id_agente='.$id_agente.'"><img src="images/target.png" border="0" title="'.__('Flag').'" /></a></td></tr>';
 
diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php
index f3fd9a686d..ffe569aabc 100644
--- a/pandora_console/operation/search_results.php
+++ b/pandora_console/operation/search_results.php
@@ -41,7 +41,7 @@ if ((!$searchMaps) && ($searchTab == 'maps')) $searchTab = "users";
 $agents = false;
 if ($searchTab == 'agents') {
 	if ($searchAgents) {
-		$sql = "SELECT id_agente, tagente.nombre, tagente.id_os, tagente.intervalo, tagente.id_grupo
+		$sql = "SELECT id_agente, tagente.nombre, tagente.id_os, tagente.intervalo, tagente.id_grupo, tagente.disabled
 			FROM tagente
 				INNER JOIN tgrupo
 					ON tgrupo.id_grupo = tagente.id_grupo
@@ -300,8 +300,15 @@ else {
 			if ($agent_info["monitor_down"] > 0)
 				$modulesCell .= ' : <span class="grey">'.$agent_info["monitor_down"].'</span>';
 			
+			if ($agent['disabled']) {
+				$cellName = "<em>" . print_agent_name ($agent["id_agente"], true, "upper") .print_help_tip(__('Disabled'), true) . "</em>";
+			}
+			else {
+				$cellName = print_agent_name ($agent["id_agente"], true, "upper");
+			}
+				
 			array_push($table->data, array(
-				print_agent_name ($agent["id_agente"], true, "upper"),
+				$cellName,
 				print_os_icon ($agent["id_os"], false, true),
 				$agent['intervalo'],
 				print_group_icon ($agent["id_grupo"], true),