1 files changed, 3 insertions, 5 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
index 42163097..ef1a1f2b 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
@@ -56,13 +56,11 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
     final IAuthProcessDataContainer authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
     AuthenticationData authData = new AuthenticationData();
 
-    String eidMode = pendingReq.getServiceProviderConfiguration()
-                               .getConfigurationValue(MsEidasNodeConstants.PROP_CONFIG_SP_EID_MODE, "old");
-
-    if (eidMode.equals("new")) {
+    boolean isEidModeNew = pendingReq.getServiceProviderConfiguration()
+                                     .isConfigurationValue(MsEidasNodeConstants.PROP_CONFIG_SP_NEW_EID_MODE, false);
 
+    if (isEidModeNew) {
       authData = (AuthenticationData) super.buildAuthenticationData(pendingReq);
-
     } else {
       try {
         generateDeprecatedBasicAuthData(authData, pendingReq, authProcessData);