diff --git a/src/main/java/net/geant/nmaas/portal/api/auth/OIDCAuthController.java b/src/main/java/net/geant/nmaas/portal/api/auth/OIDCAuthController.java
index 9f6cc69c34b54aa67f338b1625114cfc5bacdb11..0de0dcab39cc246ceeb61605a4fb9746ce2e89c5 100644
--- a/src/main/java/net/geant/nmaas/portal/api/auth/OIDCAuthController.java
+++ b/src/main/java/net/geant/nmaas/portal/api/auth/OIDCAuthController.java
@@ -44,6 +44,11 @@ public class OIDCAuthController {
                 .orElseThrow()
                 : registerNewUser(oidcUser);
 
+        if (user.getSamlToken().equals(oidcUser.getAttribute("preferred_username"))) {
+            user.setSamlToken(oidcUser.getAttribute("sub"));
+            userService.update(user);
+        }
+
         String redirectUrl = portalAddress
                 + "/login-success?token="
                 + jwtTokenService.getToken(user)