diff --git a/integration_tests/management/network_map_db/pgsql/user_test.go b/integration_tests/management/network_map_db/pgsql/user_test.go
new file mode 100644
index 000000000..12883e511
--- /dev/null
+++ b/integration_tests/management/network_map_db/pgsql/user_test.go
@@ -0,0 +1,62 @@
+package networkmap_pgsql
+
+import (
+	"context"
+	"testing"
+
+	networkmap_pgsql "github.com/netbirdio/netbird/management/internals/network_map_db/pgsql"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetAllowedUsers(t *testing.T) {
+	ctx := context.TODO()
+
+	_, err := pgstore.Pool.Query(ctx,
+		`insert into users (id, name, account_id, auto_groups, blocked, is_service_user)
+		VALUES('user-1','user-1','account-1','["group-one-resource-id"]',false,false)`)
+	assert.NoError(t, err)
+	_, err = pgstore.Pool.Query(ctx,
+		`insert into users (id, name, account_id, auto_groups, blocked, is_service_user)
+		VALUES('user-2','user-2','account-1','["group-one-resource-id","group-two-resources-id"]',false,false)`)
+	assert.NoError(t, err)
+	_, err = pgstore.Pool.Query(ctx,
+		`insert into users (id, name, account_id, auto_groups, blocked, is_service_user)
+		VALUES('user-3','user-3','account-1','["group-two-resources-id"]',false,false)`)
+	// shouldn't be included as it's blocked
+	_, err = pgstore.Pool.Query(ctx,
+		`insert into users (id, name, account_id, auto_groups, blocked, is_service_user)
+		VALUES('user-3','user-3','account-1','["group-two-resources-id"]',true,false)`)
+	assert.NoError(t, err)
+	// shouldn't be included as it's a service_user
+	_, err = pgstore.Pool.Query(ctx,
+		`insert into users (id, name, account_id, auto_groups, blocked, is_service_user)
+		VALUES('user-3','user-3','account-1','["group-two-resources-id"]',false,true)`)
+	_, err = pgstore.Pool.Query(ctx,
+		`insert into groups (id, name, account_id)
+		VALUES('all-group-1','All','account-1')`)
+	assert.NoError(t, err)
+	_, err = pgstore.Pool.Query(ctx,
+		`insert into groups (id, name, account_id)
+		VALUES('all-group-2','All','account-1')`)
+	assert.NoError(t, err)
+	_, err = pgstore.Pool.Query(ctx,
+		`insert into groups (id, name, account_id)
+		VALUES('all-group-3','All','account-1')`)
+	assert.NoError(t, err)
+
+	userIdx, groupIdToUserIds, err := networkmap_pgsql.GetAllowedUsersViaPgxConnection(ctx, conn(t, ctx), "account-1")
+	assert.NoError(t, err)
+
+	assert.Equal(t, userIdx, map[string]struct{}{
+		"user-1": {},
+		"user-2": {},
+		"user-3": {},
+	})
+	assert.Equal(t, groupIdToUserIds, map[string][]string{
+		"group-one-resource-id":  {"user-1", "user-2"},
+		"group-two-resources-id": {"user-2", "user-3"},
+		"all-group-1":            {"user-1", "user-2", "user-3"},
+		"all-group-2":            {"user-1", "user-2", "user-3"},
+		"all-group-3":            {"user-1", "user-2", "user-3"},
+	})
+}
diff --git a/management/internals/network_map_db/pgsql/user.go b/management/internals/network_map_db/pgsql/user.go
index b75fe9cb6..04fa93835 100644
--- a/management/internals/network_map_db/pgsql/user.go
+++ b/management/internals/network_map_db/pgsql/user.go
@@ -14,7 +14,7 @@ const (
 	`
 
 	GetAllGroupIdQuery = `
-	select id from groups
+	select array_agg(id) from groups
 	where account_id=$1 and name='All'
 	`
 )
@@ -42,14 +42,10 @@ func GetAllowedUsersViaPgxConnection(ctx context.Context, con *pgx.Conn, account
 	if err != nil {
 		return nil, nil, err
 	}
-	allGroupIds, err := pgx.CollectRows(rows, pgx.RowTo[string])
+	allGroupIds, err := pgx.CollectOneRow(rows, pgx.RowTo[[]string])
 	if err != nil {
 		return nil, nil, err
 	}
-	allGroupId := ""
-	if len(allGroupIds) > 0 {
-		allGroupId = allGroupIds[0]
-	}
 
 	userIdIdx := make(map[string]struct{})
 	groupIdToUserIds := make(map[string][]string)
@@ -58,8 +54,8 @@ func GetAllowedUsersViaPgxConnection(ctx context.Context, con *pgx.Conn, account
 		for _, groupId := range user.AutoGroups {
 			groupIdToUserIds[groupId] = append(groupIdToUserIds[groupId], user.ID)
 		}
-		if allGroupId != "" {
-			groupIdToUserIds[allGroupId] = append(groupIdToUserIds[allGroupId], user.ID)
+		for _, allgid := range allGroupIds {
+			groupIdToUserIds[allgid] = append(groupIdToUserIds[allgid], user.ID)
 		}
 	}