diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 783761af5e..202981bac8 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2013-08-07 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* operation/agentes/estado_agente.php: fixed the call to
+	enterprise function.
+	
+	Fixes: #2367 
+	
+	* godmode/agentes/module_manager.php: make more easy the merges
+	from the last branch.
+
 2013-08-07 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* godmode/setup/setup_auth.php, godmode/admin_access_logs.php,
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 9d0eb429d7..2ec33fd163 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -399,6 +399,7 @@ switch ($sortField) {
 		break;
 }
 
+
 // Build the order sql
 if (!empty($order)) {
 	$order_sql = ' ORDER BY ';
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 1aec641b95..c41b9fd1b6 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -491,13 +491,15 @@ foreach ($agents as $agent) {
 		// Has remote configuration ?
 		$data[9]="";
 		
-		if (config_agents_has_remote_configuration($agent["id_agente"])) {
-			$data[9] = "<a href='index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>".
-			html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')))."</a>";
+		if (enterprise_installed()) {
+			if (config_agents_has_remote_configuration($agent["id_agente"])) {
+				$data[9] = "<a href='index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>".
+				html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')))."</a>";
+			}
 		}
 		
 	}
-
+	
 	array_push ($table->data, $data);
 }