diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index b3ab870e42..0957d018ea 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* operation/agentes/ver_agente.php
+	 pandora_console/godmode/alerts/alert_list.builder.php: Fixed alert
+	 creation when metaconsole is activated.
+	 
+	 Merged from branches.
+
 2012-06-06  Vanessa Gil <vanessa.gil@artica.es>
 
 	* operation/agentes/exportdata.php: Fixed bug:
diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php
index e1c03be3d1..86223c48e0 100644
--- a/pandora_console/godmode/alerts/alert_list.builder.php
+++ b/pandora_console/godmode/alerts/alert_list.builder.php
@@ -180,6 +180,8 @@ $(document).ready (function () {
 				inputs.push ('filter=delete_pending = 0 AND id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_estado WHERE utimestamp = 0)');
 				inputs.push ("get_agent_modules_json=1");
 				inputs.push ("page=operation/agentes/ver_agente");
+				/* This will force to get local modules although metaconsole is active */
+				inputs.push ("force_local_modules=1");
 				jQuery.ajax ({
 					data: inputs.join ("&"),
 					type: 'GET',
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 256a53637c..8c06c53d1c 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -259,6 +259,8 @@ if (is_ajax ()) {
 		$indexed = (bool) get_parameter ('indexed', true);
 		$agentName = (string) get_parameter ('agent_name', null);
 		$server_name = (string) get_parameter ('server_name', null);
+		/* This will force to get local modules although metaconsole is active, by default get all modules from all nodes */
+		$force_local_modules = (int) get_parameter ('force_local_modules', 0);
 		
 		if ($agentName != null) {
 				$search = array();
@@ -267,7 +269,7 @@ if (is_ajax ()) {
 		else
 			$search = false;
 		
-		if ($config ['metaconsole'] == 1) {
+		if ($config ['metaconsole'] == 1 and !$force_local_modules) { 
 			if (enterprise_include_once ('include/functions_metaconsole.php') !== ENTERPRISE_NOT_HOOK) {
 				$connection = metaconsole_get_connection($server_name);
 				if (metaconsole_load_external_db($connection) == NOERR) {