diff --git a/internal/api/grpc/user/query.go b/internal/api/grpc/user/query.go
index 41cce01a8c..66edbac90e 100644
--- a/internal/api/grpc/user/query.go
+++ b/internal/api/grpc/user/query.go
@@ -84,11 +84,11 @@ func EmailQueryToQuery(q *user_pb.EmailQuery) (query.SearchQuery, error) {
 }
 
 func StateQueryToQuery(q *user_pb.StateQuery) (query.SearchQuery, error) {
-	return query.NewUserStateSearchQuery(int32(q.State))
+	return query.NewUserStateSearchQuery(q.State.ToDomain())
 }
 
 func TypeQueryToQuery(q *user_pb.TypeQuery) (query.SearchQuery, error) {
-	return query.NewUserTypeSearchQuery(int32(q.Type))
+	return query.NewUserTypeSearchQuery(q.Type.ToDomain())
 }
 
 func LoginNameQueryToQuery(q *user_pb.LoginNameQuery) (query.SearchQuery, error) {
diff --git a/internal/api/grpc/user/v2/query.go b/internal/api/grpc/user/v2/query.go
index 23d4b4422c..e65551d1c0 100644
--- a/internal/api/grpc/user/v2/query.go
+++ b/internal/api/grpc/user/v2/query.go
@@ -301,11 +301,11 @@ func phoneQueryToQuery(q *user.PhoneQuery) (query.SearchQuery, error) {
 }
 
 func stateQueryToQuery(q *user.StateQuery) (query.SearchQuery, error) {
-	return query.NewUserStateSearchQuery(int32(q.State))
+	return query.NewUserStateSearchQuery(q.State.ToDomain())
 }
 
 func typeQueryToQuery(q *user.TypeQuery) (query.SearchQuery, error) {
-	return query.NewUserTypeSearchQuery(int32(q.Type))
+	return query.NewUserTypeSearchQuery(q.Type.ToDomain())
 }
 
 func loginNameQueryToQuery(q *user.LoginNameQuery) (query.SearchQuery, error) {
diff --git a/internal/api/grpc/user/v2beta/query.go b/internal/api/grpc/user/v2beta/query.go
index 7baa53e73e..993e2d16b7 100644
--- a/internal/api/grpc/user/v2beta/query.go
+++ b/internal/api/grpc/user/v2beta/query.go
@@ -295,11 +295,11 @@ func phoneQueryToQuery(q *user.PhoneQuery) (query.SearchQuery, error) {
 }
 
 func stateQueryToQuery(q *user.StateQuery) (query.SearchQuery, error) {
-	return query.NewUserStateSearchQuery(int32(q.State))
+	return query.NewUserStateSearchQuery(q.State.ToDomain())
 }
 
 func typeQueryToQuery(q *user.TypeQuery) (query.SearchQuery, error) {
-	return query.NewUserTypeSearchQuery(int32(q.Type))
+	return query.NewUserTypeSearchQuery(q.Type.ToDomain())
 }
 
 func loginNameQueryToQuery(q *user.LoginNameQuery) (query.SearchQuery, error) {
diff --git a/internal/api/scim/resources/user_query_builder.go b/internal/api/scim/resources/user_query_builder.go
index b86b171fb5..7a06e4b3fd 100644
--- a/internal/api/scim/resources/user_query_builder.go
+++ b/internal/api/scim/resources/user_query_builder.go
@@ -70,7 +70,7 @@ func (h *UsersHandler) buildListQuery(ctx context.Context, request *ListRequest)
 	}
 
 	// the zitadel scim implementation only supports humans for now
-	userTypeQuery, err := query.NewUserTypeSearchQuery(int32(domain.UserTypeHuman))
+	userTypeQuery, err := query.NewUserTypeSearchQuery(domain.UserTypeHuman)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/query/user.go b/internal/query/user.go
index c30eaaec74..1bf45c9a4c 100644
--- a/internal/query/user.go
+++ b/internal/query/user.go
@@ -768,11 +768,11 @@ func NewUserVerifiedPhoneSearchQuery(value string, comparison TextComparison) (S
 	return NewTextQuery(NotifyVerifiedPhoneCol, value, comparison)
 }
 
-func NewUserStateSearchQuery(value int32) (SearchQuery, error) {
+func NewUserStateSearchQuery(value domain.UserState) (SearchQuery, error) {
 	return NewNumberQuery(UserStateCol, value, NumberEquals)
 }
 
-func NewUserTypeSearchQuery(value int32) (SearchQuery, error) {
+func NewUserTypeSearchQuery(value domain.UserType) (SearchQuery, error) {
 	return NewNumberQuery(UserTypeCol, value, NumberEquals)
 }
 
diff --git a/pkg/grpc/user/user.go b/pkg/grpc/user/user.go
index 450370e704..a86c957fd8 100644
--- a/pkg/grpc/user/user.go
+++ b/pkg/grpc/user/user.go
@@ -1,5 +1,7 @@
 package user
 
+import "github.com/zitadel/zitadel/internal/domain"
+
 type SearchQuery_ResourceOwner struct {
 	ResourceOwner *ResourceOwnerQuery
 }
@@ -13,3 +15,37 @@ type ResourceOwnerQuery struct {
 type UserType = isUser_Type
 
 type MembershipType = isMembership_Type
+
+func (s UserState) ToDomain() domain.UserState {
+	switch s {
+	case UserState_USER_STATE_UNSPECIFIED:
+		return domain.UserStateUnspecified
+	case UserState_USER_STATE_ACTIVE:
+		return domain.UserStateActive
+	case UserState_USER_STATE_INACTIVE:
+		return domain.UserStateInactive
+	case UserState_USER_STATE_DELETED:
+		return domain.UserStateDeleted
+	case UserState_USER_STATE_LOCKED:
+		return domain.UserStateLocked
+	case UserState_USER_STATE_SUSPEND:
+		return domain.UserStateSuspend
+	case UserState_USER_STATE_INITIAL:
+		return domain.UserStateInitial
+	default:
+		return domain.UserStateUnspecified
+	}
+}
+
+func (t Type) ToDomain() domain.UserType {
+	switch t {
+	case Type_TYPE_UNSPECIFIED:
+		return domain.UserTypeUnspecified
+	case Type_TYPE_HUMAN:
+		return domain.UserTypeHuman
+	case Type_TYPE_MACHINE:
+		return domain.UserTypeMachine
+	default:
+		return domain.UserTypeUnspecified
+	}
+}
diff --git a/pkg/grpc/user/v2/user.go b/pkg/grpc/user/v2/user.go
index ec9245c8eb..20c3c6fe9b 100644
--- a/pkg/grpc/user/v2/user.go
+++ b/pkg/grpc/user/v2/user.go
@@ -1,3 +1,37 @@
 package user
 
+import "github.com/zitadel/zitadel/internal/domain"
+
 type UserType = isUser_Type
+
+func (s UserState) ToDomain() domain.UserState {
+	switch s {
+	case UserState_USER_STATE_UNSPECIFIED:
+		return domain.UserStateUnspecified
+	case UserState_USER_STATE_ACTIVE:
+		return domain.UserStateActive
+	case UserState_USER_STATE_INACTIVE:
+		return domain.UserStateInactive
+	case UserState_USER_STATE_DELETED:
+		return domain.UserStateDeleted
+	case UserState_USER_STATE_LOCKED:
+		return domain.UserStateLocked
+	case UserState_USER_STATE_INITIAL:
+		return domain.UserStateInitial
+	default:
+		return domain.UserStateUnspecified
+	}
+}
+
+func (t Type) ToDomain() domain.UserType {
+	switch t {
+	case Type_TYPE_UNSPECIFIED:
+		return domain.UserTypeUnspecified
+	case Type_TYPE_HUMAN:
+		return domain.UserTypeHuman
+	case Type_TYPE_MACHINE:
+		return domain.UserTypeMachine
+	default:
+		return domain.UserTypeUnspecified
+	}
+}
diff --git a/pkg/grpc/user/v2beta/user.go b/pkg/grpc/user/v2beta/user.go
index ec9245c8eb..20c3c6fe9b 100644
--- a/pkg/grpc/user/v2beta/user.go
+++ b/pkg/grpc/user/v2beta/user.go
@@ -1,3 +1,37 @@
 package user
 
+import "github.com/zitadel/zitadel/internal/domain"
+
 type UserType = isUser_Type
+
+func (s UserState) ToDomain() domain.UserState {
+	switch s {
+	case UserState_USER_STATE_UNSPECIFIED:
+		return domain.UserStateUnspecified
+	case UserState_USER_STATE_ACTIVE:
+		return domain.UserStateActive
+	case UserState_USER_STATE_INACTIVE:
+		return domain.UserStateInactive
+	case UserState_USER_STATE_DELETED:
+		return domain.UserStateDeleted
+	case UserState_USER_STATE_LOCKED:
+		return domain.UserStateLocked
+	case UserState_USER_STATE_INITIAL:
+		return domain.UserStateInitial
+	default:
+		return domain.UserStateUnspecified
+	}
+}
+
+func (t Type) ToDomain() domain.UserType {
+	switch t {
+	case Type_TYPE_UNSPECIFIED:
+		return domain.UserTypeUnspecified
+	case Type_TYPE_HUMAN:
+		return domain.UserTypeHuman
+	case Type_TYPE_MACHINE:
+		return domain.UserTypeMachine
+	default:
+		return domain.UserTypeUnspecified
+	}
+}