diff --git a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
index 4d1e39c57d2587b8cf96376095c120bfc345da39..0eae4de30876c193170e033989b5819baf8581a4 100644
--- a/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
+++ b/fda-authentication-service/rest-service/src/main/java/at/tuwien/config/SamlConfig.java
@@ -49,6 +49,9 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
     @Value("${fda.idp.metadata}")
     private String idpProviderMetadata;
 
+    @Value("${fda.idp.entity-id}")
+    private String idpEntityId;
+
     @Value("${fda.saml.signkey}")
     private String samlSignKey;
 
@@ -274,7 +277,7 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
     @Bean
     public MetadataGenerator metadataGenerator() {
         final MetadataGenerator metadataGenerator = new MetadataGenerator();
-        metadataGenerator.setEntityId("at:tuwien");
+        metadataGenerator.setEntityId(idpEntityId);
         metadataGenerator.setRequestSigned(false);
         metadataGenerator.setExtendedMetadata(extendedMetadata());
         metadataGenerator.setIncludeDiscoveryExtension(false);
@@ -289,6 +292,8 @@ public class SamlConfig extends WebSecurityConfigurerAdapter {
         final SAMLContextProviderLB contextProvider = new SAMLContextProviderLB();
         contextProvider.setScheme("https");
         contextProvider.setServerName(serverName + ":" + serverPort);
+        contextProvider.setServerPort(Integer.parseInt(serverPort));
+        contextProvider.setIncludeServerPortInRequestURL(false);
         contextProvider.setContextPath("/");
         return contextProvider;
     }
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
index 94affec97246912043eb52229ffe4368ee71ae7a..5a724a57eeccd2c35f5ffda725864a60726d8724 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
@@ -33,6 +33,8 @@ eureka:
   client.serviceUrl.defaultZone: http://fda-discovery-service:9090/eureka/
 fda:
   ready.path: /ready
-  idp.metadata: https://idp.zid.tuwien.ac.at/saml2
+  idp:
+    entity-id: "at:tuwien"
+    metadata: https://idp.zid.tuwien.ac.at/saml2
   saml.signkey: saml
   base-url: https://fda-authentication-service
\ No newline at end of file
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml b/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml
index 614828e30d2b1457be8067dc70268ebabc5177e7..9974f0be9a258e1ee8493dbb5d591e989644130a 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-sandbox.yml
@@ -26,13 +26,15 @@ server:
 logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
-    root: warn
+    root: debug
     at.tuwien.: debug
 eureka:
   instance.hostname: fda-authentication-service
   client.serviceUrl.defaultZone: http://fda-discovery-service:9090/eureka/
 fda:
   ready.path: /ready
-  idp.metadata: https://idp.zid.tuwien.ac.at/saml2
+  idp:
+    entity-id: "at:tuwien"
+    metadata: https://idp.zid.tuwien.ac.at/saml2
   saml.signkey: saml
   base-url: https://dbrepo.ossdip.at:9097
\ No newline at end of file