diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java
index 757453909..e3dfd72f9 100644
--- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java
+++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java
@@ -18,4 +18,5 @@ public interface UserRepository extends ReactiveMongoRepository<User, String> {
 
     Flux<User> findByConnections_SourceAndConnections_RawIdIn(String source, Collection<String> rawIds);
 
+    Mono<User> findByName(String rawUuid);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java
index b93e37594..aebed82ef 100644
--- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java
+++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java
@@ -32,7 +32,9 @@ public interface UserService {
 
     Mono<Boolean> bindEmail(User user, String email);
 
-    Mono<User> findByAuthUser(AuthUser authUser);
+    Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser);
+
+    Mono<User> findByAuthUserRawId(AuthUser authUser);
 
     Mono<User> createNewUserByAuthUser(AuthUser authUser);
 
@@ -40,6 +42,8 @@ public interface UserService {
 
     Mono<Boolean> addNewConnection(String userId, Connection connection);
 
+    Mono<User> addNewConnectionAndReturnUser(String userId, Connection connection);
+
     Mono<Void> deleteProfilePhoto(User visitor);
 
     Mono<Boolean> updatePassword(String userId, String oldPassword, String newPassword);
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
index 1ea542e30..49fc9f478 100644
--- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
+++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
@@ -111,6 +111,10 @@ public Mono<User> findBySourceAndId(String source, String sourceUuid) {
         return repository.findByConnections_SourceAndConnections_RawId(source, sourceUuid);
     }
 
+    public Mono<User> findByName(String rawUuid) {
+        return repository.findByName(rawUuid);
+    }
+
     @Override
     public Mono<Boolean> saveProfilePhoto(Part filePart, User user) {
         String prevAvatar = ObjectUtils.defaultIfNull(user.getAvatar(), "");
@@ -143,10 +147,15 @@ public Mono<User> update(String id, User updatedUser) {
     }
 
     @Override
-    public Mono<User> findByAuthUser(AuthUser authUser) {
+    public Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser) {
         return findBySourceAndId(authUser.getSource(), authUser.getUid());
     }
 
+    @Override
+    public Mono<User> findByAuthUserRawId(AuthUser authUser) {
+        return findByName(authUser.getUsername());
+    }
+
     @Override
     public Mono<User> createNewUserByAuthUser(AuthUser authUser) {
         User newUser = new User();
@@ -198,6 +207,13 @@ public Mono<Boolean> addNewConnection(String userId, Connection connection) {
                 .then(Mono.just(true));
     }
 
+    @Override
+    public Mono<User> addNewConnectionAndReturnUser(String userId, Connection connection) {
+        return findById(userId)
+                .doOnNext(user -> user.getConnections().add(connection))
+                .flatMap(repository::save);
+    }
+
     @Override
     public Mono<Void> deleteProfilePhoto(User visitor) {
         String userAvatar = visitor.getAvatar();
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/KeycloakRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/KeycloakRequest.java
index 31dcd650d..7aeecd073 100644
--- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/KeycloakRequest.java
+++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/KeycloakRequest.java
@@ -116,7 +116,7 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
                     }
                     AuthUser authUser = AuthUser.builder()
                             .uid(MapUtils.getString(map, "sub"))
-                            .username(MapUtils.getString(map, "name"))
+                            .username(MapUtils.getString(map, "email"))
                             .rawUserInfo(map)
                             .build();
                     return Mono.just(authUser);
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
index d4b934b7a..966b86bb7 100644
--- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
+++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
@@ -161,14 +161,26 @@ public Mono<Void> loginOrRegister(AuthUser authUser, ServerWebExchange exchange,
     }
 
     private Mono<User> updateOrCreateUser(AuthUser authUser) {
-        return findByAuthUser(authUser)
-                .flatMap(findByAuthUser -> {
-                    if (findByAuthUser.userExist()) {
-                        User user = findByAuthUser.user();
+        return findByAuthUserSourceAndRawId(authUser).zipWith(findByAuthUserRawId(authUser))
+                .flatMap(tuple -> {
+
+                    FindByAuthUser findByAuthUserFirst = tuple.getT1();
+                    FindByAuthUser findByAuthUserSecond = tuple.getT2();
+
+                    // If the user is found for the same auth source and id, just update the connection
+                    if (findByAuthUserFirst.userExist()) {
+                        User user = findByAuthUserFirst.user();
                         updateConnection(authUser, user);
                         return userService.update(user.getId(), user);
                     }
 
+                    //If the user connection is not found with login id, but the user is
+                    // found for the same id in some different connection, then just add a new connection to the user
+                    if(findByAuthUserSecond.userExist()) {
+                        User user = findByAuthUserSecond.user();
+                        return userService.addNewConnectionAndReturnUser(user.getId(), authUser.toAuthConnection());
+                    }
+
                     // if the user is logging/registering via OAuth provider for the first time,
                     // but is not anonymous, then just add a new connection
 
@@ -189,8 +201,14 @@ private Mono<User> updateOrCreateUser(AuthUser authUser) {
                 });
     }
 
-    protected Mono<FindByAuthUser> findByAuthUser(AuthUser authUser) {
-        return userService.findByAuthUser(authUser)
+    protected Mono<FindByAuthUser> findByAuthUserSourceAndRawId(AuthUser authUser) {
+        return userService.findByAuthUserSourceAndRawId(authUser)
+                .map(user -> new FindByAuthUser(true, user))
+                .defaultIfEmpty(new FindByAuthUser(false, null));
+    }
+
+    protected Mono<FindByAuthUser> findByAuthUserRawId(AuthUser authUser) {
+        return userService.findByAuthUserRawId(authUser)
                 .map(user -> new FindByAuthUser(true, user))
                 .defaultIfEmpty(new FindByAuthUser(false, null));
     }