1 files changed, 9 insertions, 5 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
index f8a828f6f..adef74370 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
@@ -207,13 +207,17 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 			        String mandateReferenceValue = session.getMandateReferenceValue();
 			        byte[] cert = session.getEncodedSignerCertificate();
 			        
-			        String targetType = null;
-			        
-			        if(session.getBusinessService()) {
-			        	targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_+session.getDomainIdentifier();
+			        //TODO: check in case of SSO!!!
+			        String targetType = null;  
+			        if(oaParam.getBusinessService()) {
+			        	String id = oaParam.getIdentityLinkDomainIdentifier();
+			        	if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_))
+			        		targetType = id;
+			        	else
+			        		targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_+session.getDomainIdentifier();
 			        	
 			        } else {
-			        	targetType = AuthenticationSession.TARGET_PREFIX_ + session.getTarget();
+			        	targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget();
 			        }