diff --git a/pkg/service/oidc_provider.go b/pkg/service/oidc_provider.go
index 07c1743..abb82a8 100644
--- a/pkg/service/oidc_provider.go
+++ b/pkg/service/oidc_provider.go
@@ -71,7 +71,7 @@ func (s *oidcProvider) getPartnerOrganization(ctx context.Context, provider *sys
 }
 
 func (s *oidcProvider) Create(ctx context.Context, provider *systemv3.OIDCProvider) (*systemv3.OIDCProvider, error) {
-	name := provider.Metadata.GetName()
+	name := provider.GetMetadata().GetName()
 	if len(name) == 0 {
 		return &systemv3.OIDCProvider{}, fmt.Errorf("EMPTY NAME")
 	}
@@ -79,6 +79,10 @@ func (s *oidcProvider) Create(ctx context.Context, provider *systemv3.OIDCProvid
 	if scopes == nil || len(scopes) == 0 {
 		return &systemv3.OIDCProvider{}, fmt.Errorf("NO SCOPES")
 	}
+	issUrl := provider.GetSpec().GetIssuerUrl()
+	if len(issUrl) == 0 {
+		return &systemv3.OIDCProvider{}, fmt.Errorf("EMPTY ISSUER URL")
+	}
 
 	partnerId, organizationId, err := s.getPartnerOrganization(ctx, provider)
 	if err != nil {
@@ -87,26 +91,34 @@ func (s *oidcProvider) Create(ctx context.Context, provider *systemv3.OIDCProvid
 	p, _ := dao.GetIdByNamePartnerOrg(
 		ctx,
 		s.db,
-		provider.GetMetadata().GetName(),
+		name,
 		uuid.NullUUID{UUID: partnerId, Valid: true},
 		uuid.NullUUID{UUID: organizationId, Valid: true},
 		&models.OIDCProvider{},
 	)
 	if p != nil {
-		return nil, fmt.Errorf("OIDC provider %q already exists", provider.GetMetadata().GetName())
+		return nil, fmt.Errorf("OIDC provider %q already exists", name)
+	}
+
+	p, _ = dao.GetM(ctx, s.db, map[string]interface{}{
+		"issuer_url":      issUrl,
+		"partner_id":      partnerId,
+		"organization_id": organizationId,
+	}, &models.OIDCProvider{})
+	if p != nil {
+		return nil, fmt.Errorf("DUPLICATE ISSUER URL")
+	}
+	if validateURL(issUrl) != nil {
+		return &systemv3.OIDCProvider{}, fmt.Errorf("INVALID ISSUER URL")
 	}
 
 	mapUrl := provider.Spec.GetMapperUrl()
-	issUrl := provider.Spec.GetIssuerUrl()
 	authUrl := provider.Spec.GetAuthUrl()
 	tknUrl := provider.Spec.GetTokenUrl()
 
 	if len(mapUrl) != 0 && validateURL(mapUrl) != nil {
 		return &systemv3.OIDCProvider{}, fmt.Errorf("INVALID MAPPER URL")
 	}
-	if len(issUrl) != 0 && validateURL(issUrl) != nil {
-		return &systemv3.OIDCProvider{}, fmt.Errorf("INVALID ISSUER URL")
-	}
 	if len(authUrl) != 0 && validateURL(authUrl) != nil {
 		return &systemv3.OIDCProvider{}, fmt.Errorf("INVALID AUTH URL")
 	}