diff --git a/generators/server/templates/src/main/java/package/service/_SocialService.java b/generators/server/templates/src/main/java/package/service/_SocialService.java
index fbb1dfc90776..9f4cb8cc35ca 100644
--- a/generators/server/templates/src/main/java/package/service/_SocialService.java
+++ b/generators/server/templates/src/main/java/package/service/_SocialService.java
@@ -76,10 +76,12 @@ private User createUserIfNotExist(UserProfile userProfile, String langKey, Strin
             log.error("Cannot create social user because email is null and login already exist, login -> {}", userName);
             throw new IllegalArgumentException("Email cannot be null with an existing login");
         }
-        Optional<User> user = userRepository.findOneByEmail(email);
-        if (user.isPresent()) {
-            log.info("User already exist associate the connection to this account");
-            return user.get();
+        if (!StringUtils.isBlank(email)) {
+            Optional<User> user = userRepository.findOneByEmail(email);
+            if (user.isPresent()) {
+                log.info("User already exist associate the connection to this account");
+                return user.get();
+            }
         }
 
         String login = getLoginDependingOnProviderId(userProfile, providerId);