2 files changed, 3 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index f19881578..204e7f724 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -1920,11 +1920,12 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     	authnRequest.setEIDSectorShare(true);
 
     	authnRequest.setCitizenCountryCode("LOCAL");
+//    	authnRequest.setCitizenCountryCode(moasession.getCcc());
 
 
     	Logger.debug("STORK AuthnRequest succesfully assembled.");
 
-    	STORKSAMLEngine samlEngine = STORKSAMLEngine.getInstance("CONF0");
+    	STORKSAMLEngine samlEngine = STORKSAMLEngine.getInstance("outgoing");
     	try {
     		authnRequest = samlEngine.generateSTORKAuthnRequest(authnRequest);
     	} catch (STORKSAMLEngineException e) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index f05180932..4819b8219 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -97,7 +97,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 			}
 
 			//Get SAMLEngine instance
-			STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF0");
+			STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing");
 
 			STORKAuthnResponse authnResponse = null;
 			try {