diff --git a/internal/api/grpc/management/policy_login.go b/internal/api/grpc/management/policy_login.go
index 865e14c0ab..49dabf0bc6 100644
--- a/internal/api/grpc/management/policy_login.go
+++ b/internal/api/grpc/management/policy_login.go
@@ -14,7 +14,7 @@ import (
 )
 
 func (s *Server) GetLoginPolicy(ctx context.Context, req *mgmt_pb.GetLoginPolicyRequest) (*mgmt_pb.GetLoginPolicyResponse, error) {
-	policy, err := s.query.LoginPolicyByID(ctx, "")
+	policy, err := s.query.LoginPolicyByID(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/management/repository/eventsourcing/repository.go b/internal/management/repository/eventsourcing/repository.go
index 37027773f7..49d3847c53 100644
--- a/internal/management/repository/eventsourcing/repository.go
+++ b/internal/management/repository/eventsourcing/repository.go
@@ -73,6 +73,7 @@ func Start(conf Config, systemDefaults sd.SystemDefaults, roles []string, querie
 			NotificationDir:                     statikNotificationFS,
 			LoginTranslationFileContents:        make(map[string][]byte),
 			NotificationTranslationFileContents: make(map[string][]byte),
+			Query:                               queries,
 		},
 		ProjectRepo:   eventstore.ProjectRepo{es, conf.SearchLimit, view, roles, systemDefaults.IamID, assetsAPI},
 		UserRepo:      eventstore.UserRepo{es, conf.SearchLimit, view, systemDefaults, assetsAPI},
diff --git a/internal/query/idp.go b/internal/query/idp.go
index 873386b3eb..4d1859f63f 100644
--- a/internal/query/idp.go
+++ b/internal/query/idp.go
@@ -91,7 +91,7 @@ var (
 		name:  projection.IDPStylingTypeCol,
 		table: idpTable,
 	}
-	IDPOwnerCol = Column{
+	IDPOwnerTypeCol = Column{
 		name:  projection.IDPOwnerTypeCol,
 		table: idpTable,
 	}
@@ -203,6 +203,8 @@ func (q *Queries) SearchIDPs(ctx context.Context, resourceOwner string, queries
 		sq.Or{
 			sq.Eq{
 				IDPResourceOwnerCol.identifier(): resourceOwner,
+			},
+			sq.Eq{
 				IDPResourceOwnerCol.identifier(): q.iamID,
 			},
 		},
@@ -235,14 +237,7 @@ func NewIDPIDSearchQuery(id string) (SearchQuery, error) {
 }
 
 func NewIDPOwnerTypeSearchQuery(ownerType domain.IdentityProviderType) (SearchQuery, error) {
-	switch ownerType {
-	case domain.IdentityProviderTypeOrg:
-		return NewBoolQuery(LoginPolicyColumnIsDefault, false)
-	case domain.IdentityProviderTypeSystem:
-		return NewBoolQuery(LoginPolicyColumnIsDefault, true)
-	default:
-		return nil, errors.ThrowUnimplemented(nil, "QUERY-8yZAI", "Errors.Query.InvalidRequest")
-	}
+	return NewNumberQuery(IDPOwnerTypeCol, ownerType, NumberEquals)
 }
 
 func NewIDPNameSearchQuery(method TextComparison, value string) (SearchQuery, error) {
@@ -267,7 +262,7 @@ func prepareIDPByIDQuery() (sq.SelectBuilder, func(*sql.Row) (*IDP, error)) {
 			IDPStateCol.identifier(),
 			IDPNameCol.identifier(),
 			IDPStylingTypeCol.identifier(),
-			IDPOwnerCol.identifier(),
+			IDPOwnerTypeCol.identifier(),
 			IDPAutoRegisterCol.identifier(),
 			OIDCIDPColIDPID.identifier(),
 			OIDCIDPColClientID.identifier(),
@@ -375,7 +370,7 @@ func prepareIDPsQuery() (sq.SelectBuilder, func(*sql.Rows) (*IDPs, error)) {
 			IDPStateCol.identifier(),
 			IDPNameCol.identifier(),
 			IDPStylingTypeCol.identifier(),
-			IDPOwnerCol.identifier(),
+			IDPOwnerTypeCol.identifier(),
 			IDPAutoRegisterCol.identifier(),
 			OIDCIDPColIDPID.identifier(),
 			OIDCIDPColClientID.identifier(),