diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index eb0f0136e4..04ce1337e0 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-06  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* include/functions_api.php: fixed into function "get_events__with_user"
+	when try get list events when empty list of groups for user.
+	
+	* include/api.php: fixed the auth.
+
 2012-02-06  Ramon Novoa  <rnovoa@artica.es>
 
 	* operation/netflow/nf_live_view.php: Added ACL checks for filter
diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php
index 3c2bd26c25..04112e824e 100644
--- a/pandora_console/include/api.php
+++ b/pandora_console/include/api.php
@@ -52,7 +52,12 @@ if (!empty($apiPassword)) {
 	}
 }
 else {
-	if (isInACL($ipOrigin)) {
+	$user_in_db = process_user_login($user, $password);
+	if ($user_in_db !== false) {
+		$config['id_user'] = $user_in_db;
+		$correctLogin = true;
+	}
+	else if (isInACL($ipOrigin)) {
 		$correctLogin = true;
 	}
 }
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index db387725ad..0d5851c2c2 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -4348,8 +4348,14 @@ function get_events__with_user($trash1, $trash2, $other, $returnType, $user_in_d
 	//to a function.
 	
 	$groups = users_get_groups ($user_in_db, "IR");
+	$is_admin = (bool)db_get_value('is_admin', 'tusuario', 'id_user', $user_in_db);
 	
-	$sql_post = " AND id_grupo IN (".implode (",", array_keys ($groups)).")";
+	if (!empty($groups)) {
+		$sql_post = " AND id_grupo IN (".implode (",", array_keys ($groups)).")";
+	}
+	else if ($is_admin) {
+		$sql_post = " AND 1 = 0";
+	}
 	
 	// Skip system messages if user is not PM
 	if (!check_acl ($user_in_db, 0, "PM")) {