diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java
index c82054153..703253a4b 100644
--- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java
+++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java
@@ -59,7 +59,12 @@ public Flux<FindAuthConfig> findAllAuthConfigs(String orgId, boolean enableOnly)
 
         Mono<FindAuthConfig> emailAuthConfigMono = orgMemberService.doesAtleastOneAdminExist()
                 .map(doesAtleastOneAdminExist -> {
-                    boolean shouldEnableRegister = !doesAtleastOneAdminExist && authProperties.getEmail().isEnableRegister();
+                    boolean shouldEnableRegister;
+                    if(doesAtleastOneAdminExist) {
+                        shouldEnableRegister = authProperties.getEmail().getEnableRegister();
+                    } else {
+                        shouldEnableRegister = Boolean.TRUE;
+                    }
                     return new FindAuthConfig
                             (new EmailAuthConfig(AuthSourceConstants.EMAIL, authProperties.getEmail().isEnable(), shouldEnableRegister), null);
                 });