diff --git a/app/module/ppid_data_categories/service/ppid_data_categories.service.go b/app/module/ppid_data_categories/service/ppid_data_categories.service.go
index 423603a..3128b7f 100644
--- a/app/module/ppid_data_categories/service/ppid_data_categories.service.go
+++ b/app/module/ppid_data_categories/service/ppid_data_categories.service.go
@@ -109,6 +109,9 @@ func (_i *ppidDataCategoriesService) AllInPpidData(req request.PpidDataCategorie
 		createdBy := utilSvc.GetUserInfo(_i.Log, _i.UsersRepo, authToken)
 		if createdBy != nil {
 			req.LevelGroupId = &createdBy.UserLevelId
+		} else {
+			mabesGroup := "mabes"
+			req.Group = &mabesGroup
 		}
 	}
 	results, paging, err := _i.Repo.GetAll(req)
diff --git a/app/module/users/service/users.service.go b/app/module/users/service/users.service.go
index e390a5b..26fed62 100644
--- a/app/module/users/service/users.service.go
+++ b/app/module/users/service/users.service.go
@@ -3,6 +3,7 @@ package service
 import (
 	"github.com/Nerzal/gocloak/v13"
 	"github.com/rs/zerolog"
+	userLevelsRepository "go-humas-be/app/module/user_levels/repository"
 	"go-humas-be/app/module/users/mapper"
 	"go-humas-be/app/module/users/repository"
 	"go-humas-be/app/module/users/request"
@@ -14,9 +15,10 @@ import (
 
 // UsersService
 type usersService struct {
-	Repo     repository.UsersRepository
-	Log      zerolog.Logger
-	Keycloak *config.KeycloakConfig
+	Repo           repository.UsersRepository
+	userLevelsRepo userLevelsRepository.UserLevelsRepository
+	Log            zerolog.Logger
+	Keycloak       *config.KeycloakConfig
 }
 
 // UsersService define interface of IUsersService
@@ -48,7 +50,7 @@ func (_i *usersService) All(req request.UsersQueryRequest) (users []*response.Us
 	}
 
 	for _, result := range results {
-		users = append(users, mapper.UsersResponseMapper(result))
+		users = append(users, mapper.UsersResponseMapper(result, _i.userLevelsRepo))
 	}
 
 	return
@@ -60,13 +62,13 @@ func (_i *usersService) Show(id uint) (users *response.UsersResponse, err error)
 		return nil, err
 	}
 
-	return mapper.UsersResponseMapper(result), nil
+	return mapper.UsersResponseMapper(result, _i.userLevelsRepo), nil
 }
 
 func (_i *usersService) ShowUserInfo(authToken string) (users *response.UsersResponse, err error) {
 	userInfo := utilSvc.GetUserInfo(_i.Log, _i.Repo, authToken)
 
-	return mapper.UsersResponseMapper(userInfo), nil
+	return mapper.UsersResponseMapper(userInfo, _i.userLevelsRepo), nil
 }
 
 func (_i *usersService) Save(req request.UsersCreateRequest, authToken string) (err error) {