diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 8202d0db6b..43fe942604 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* extensions/update_manager/main.php: Added message when user 
+	doesn't have an enterprise update installed on web console.
+	
+	Merged from branches.
+
 2012-06-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 	
 	* operation/agentes/estado_agente.php: Lost lines from my last 
diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php
index 0e3e1e13da..363d89d7c4 100644
--- a/pandora_console/extensions/update_manager/main.php
+++ b/pandora_console/extensions/update_manager/main.php
@@ -85,9 +85,12 @@ function main_view_enterprise($settings, $user_key) {
 	
 	
 	echo '<h4>';
-		echo __('Your Pandora FMS Enterprise version number is') . ' ' .
-			$settings->current_update;
-	echo "</h4>";
+		if ($settings->current_update == 0) 
+			echo __('You do not have installed any updates of Pandora FMS Enterprise');
+		else
+			echo __('Your Pandora FMS Enterprise version number is') . ' ' .
+				$settings->current_update;
+	echo '</h4>';
 	
 	echo "<br><br>";