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 1488935..8d6190a 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
@@ -52,7 +52,7 @@ public void authenticate(AuthenticationFlowContext context) {
         logger.debug("Context Key: " + s + " Value: " + brokerClaims.get(s));
       }
 
-      String accountType = context.getUser().getFirstAttribute("user.attributes.account_type");
+      String accountType = CommonUtils.getValueForAttribute("user.attributes.account_type", brokerContext);
 
       if (accountType == null) {
         throw new SoamRuntimeException("Account type is null; account type should always be available, check the IDP mappers for the hardcoded attribute");