diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 472e035ce9..c5efe243bb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,7 +1,15 @@
+2008-10-20  Manuel Arostegui  <marostegui@artica.es>
+
+	* operation/agentes/estado_agente.php: Fixed agent status color
+	column. It was showing incorrect values in some cases like without
+	data or monitors.
+
+	* ChangeLog: Fixed Jorge previous commit style.
+
 2008-10-20  Jorge Gonzalez  <jorgegonz@artica.es>
 
-        * operation/agentes/estado_agente.php, operation/agentes/bulbs.php:
-          reverted changes.
+	* operation/agentes/estado_agente.php, operation/agentes/bulbs.php:
+	Reverted changes.
 
 2008-10-20  Jorge Gonzalez  <jorgegonz@artica.es>
 
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index f846f9855a..aaf70bb1d6 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -321,22 +321,24 @@ echo '<img class="bot" src="images/groups_small/'.show_icon_group($id_grupo).'.p
 			if ($numero_monitor <> 0){
 				if ($estado_general <> 0){
 					if ($estado_cambio == 0){
-						echo "<img src='images/pixel_red.png' width=40 height=18 title='".__('At least one monitor fails')."'>";
+						echo '<img src="images/pixel_red.png" width="40" height="18" title="'.__('At least one monitor fails').'" />';
 					} else {
-						echo "<img src='images/pixel_yellow.png' width=40 height=18 title='".__('Change between Green/Red state')."'>";
+						echo '<img src="images/pixel_yellow.png" width="40" height="18" title="'.__('Change between Green/Red state').'" />';
 					}
 				} elseif ($monitor_ok > 0) {
-					echo "<img src='images/pixel_green.png' width=40 height=18 title='".__('All Monitors OK')."'>";
+					echo '<img src="images/pixel_green.png" width="40" height="18" title="'.__('All Monitors OK').'" />';
+				} elseif ($numero_datamodules == 0) {
+					echo '<img src="images/pixel_blue.png" width="40" height="18" title="'.__('Agent without data').'" />';
+				} elseif ($monitor_down > 0) {
+					echo '<img src="images/pixel_fucsia.png" width="40" height="18" title="'.__('Agent down').'" />'; 
 				}
-				elseif ($numero_datamodules > 0) {
-					echo "<img src='images/pixel_blue.png' width=40 height=18 title='".__('Agent without monitors')."'>";
+			} else {
+				if ($numero_datamodules == 0) {
+                                        echo '<img src="images/pixel_blue.png" width="40" height="18" title="'.__('Agent without data').'" />';
+                                } else {
+					echo '<img src="images/pixel_gray.png" width="40" height="18" title="'.__('Agent without monitors').'" />';
 				}
-				elseif ($monitor_down > 0) {
-					echo "<img src='images/pixel_fucsia.png' width=40 height=18 title='".__('Agent down')."'>"; 
-				}
-			} else 
-				echo "<img src='images/pixel_blue.png' width=40 height=18 title='".__('Agent without data')."'>";
-			
+			}
 			// checks if an alert was fired recently
 			echo "<td class='$tdcolor' align='center'>";
 			if (give_disabled_group($id_grupo) == 1)