diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/OrganizationManager.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/OrganizationManager.java
index a2f642427d..a1a4927308 100644
--- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/OrganizationManager.java
+++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/OrganizationManager.java
@@ -351,6 +351,14 @@ public OpenCGAResult<OrganizationConfiguration> updateConfiguration(String organ
                         throw new CatalogParameterException("Found duplicated authentication origin id '" + authenticationOrigin.getId()
                                 + "'.");
                     }
+                    // Check authOrigin OPENCGA-OPENCGA
+                    if ((authenticationOrigin.getType().equals(AuthenticationOrigin.AuthenticationType.OPENCGA)
+                            && !CatalogAuthenticationManager.OPENCGA.equals(authenticationOrigin.getId()))
+                            || (!authenticationOrigin.getType().equals(AuthenticationOrigin.AuthenticationType.OPENCGA)
+                            && CatalogAuthenticationManager.OPENCGA.equals(authenticationOrigin.getId()))) {
+                        throw new CatalogParameterException("AuthenticationOrigin type '" + AuthenticationOrigin.AuthenticationType.OPENCGA
+                                + "' must go together with id '" + CatalogAuthenticationManager.OPENCGA + "'.");
+                    }
                     updateAuthOriginIds.add(authenticationOrigin.getId());
                     if (i > 0) {
                         authOriginUpdateBuilder.append(", ");