1 files changed, 4 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
index 7a356aaf0..03b012a27 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
@@ -136,8 +136,10 @@ public class DefaultLoginParameterResolver implements LoginParameterResolver {
       return authData.getDateOfBirth();
     if (predicate.equals(MOABPK))
       return authData.getBPK();
-    if (predicate.equals(MOAWBPK))
-      return authData.getWBPK();
+    
+    //AuthData holdes the correct BPK/WBPK
+    if (predicate.equals(MOAWBPK))  
+      return authData.getBPK();
     if (predicate.equals(MOAPublicAuthority))
       if (authData.isPublicAuthority())
         return "true";