diff --git a/docker/keycloak/extensions-24/services/src/main/java/com/github/bcgov/keycloak/authenticators/SoamFirstTimeLoginAuthenticator.java b/docker/keycloak/extensions-24/services/src/main/java/com/github/bcgov/keycloak/authenticators/SoamFirstTimeLoginAuthenticator.java
index 0419a40..b8155e2 100644
--- a/docker/keycloak/extensions-24/services/src/main/java/com/github/bcgov/keycloak/authenticators/SoamFirstTimeLoginAuthenticator.java
+++ b/docker/keycloak/extensions-24/services/src/main/java/com/github/bcgov/keycloak/authenticators/SoamFirstTimeLoginAuthenticator.java
@@ -70,9 +70,9 @@ protected void authenticateImpl(AuthenticationFlowContext context, SerializedBro
       case "bceidbasic":
         logger.debug("SOAM: Account type bceid found");
         if (username == null) {
-          throw new SoamRuntimeException("No bceid_user_guid value was found in token");
+          throw new SoamRuntimeException("No bceid_guid value was found in token");
         }
-        createOrUpdateUser(CommonUtils.getValueForAttribute("user.attributes.bceid_user_guid", brokerContext), accountType, "BASIC", null);
+        createOrUpdateUser(CommonUtils.getValueForAttribute("user.attributes.bceid_guid", brokerContext), accountType, "BASIC", null);
         break;
       case "bcsc":
         logger.debug("SOAM: Account type bcsc found");
diff --git a/docker/keycloak/extensions-24/services/src/main/java/com/github/bcgov/keycloak/authenticators/SoamPostLoginAuthenticator.java b/docker/keycloak/extensions-24/services/src/main/java/com/github/bcgov/keycloak/authenticators/SoamPostLoginAuthenticator.java
index 8d6190a..c3994d5 100644
--- a/docker/keycloak/extensions-24/services/src/main/java/com/github/bcgov/keycloak/authenticators/SoamPostLoginAuthenticator.java
+++ b/docker/keycloak/extensions-24/services/src/main/java/com/github/bcgov/keycloak/authenticators/SoamPostLoginAuthenticator.java
@@ -73,10 +73,10 @@ public void authenticate(AuthenticationFlowContext context) {
           break;
         case "bceidbasic":
           logger.debug("SOAM Post: Account type basic bceid found");
-          user_guid = CommonUtils.getValueForAttribute("user.attributes.bceid_user_guid", brokerContext);
+          user_guid = CommonUtils.getValueForAttribute("user.attributes.bceid_guid", brokerContext);
           existingUser.setSingleAttribute("user_guid", user_guid);
           if (user_guid == null) {
-            throw new SoamRuntimeException("No bceid_user_guid value was found in token");
+            throw new SoamRuntimeException("No bceid_guid value was found in token");
           }
           updateUserInfo(user_guid, accountType, "BASIC", null);
           break;