diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java
index 0258e0f2..47e08eba 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java
@@ -36,7 +36,7 @@ public class WebserviceInfo {
     private static final String VERSION_KEY = "sebserver.version";
     private static final String WEB_SERVICE_TEST_PROPERTY = "sebserver.test.property";
     private static final String WEB_SERVICE_SERVER_NAME_KEY = "sebserver.webservice.http.external.servername";
-    private static final String WEB_SERVICE_HTTP_SCHEME_KEY = "sebserver.webservice.http.scheme";
+    private static final String WEB_SERVICE_HTTP_SCHEME_KEY = "sebserver.webservice.http.external.scheme";
     private static final String WEB_SERVICE_HTTP_PORT = "sebserver.webservice.http.external.port";
     private static final String WEB_SERVICE_HOST_ADDRESS_KEY = "server.address";
     private static final String WEB_SERVICE_SERVER_PORT_KEY = "server.port";
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/SEBServerUser.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/SEBServerUser.java
index cfb17532..eb1c0595 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/SEBServerUser.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/SEBServerUser.java
@@ -43,7 +43,7 @@ public final class SEBServerUser implements UserDetails, CredentialsContainer {
         this.authorities = Collections.unmodifiableList(
                 userInfo.roles
                         .stream()
-                        .map(SimpleGrantedAuthority::new)
+                        .map(role -> new SimpleGrantedAuthority(role))
                         .collect(Collectors.toList()));
 
         if (CollectionUtils.isEmpty(userInfo.roles)) {
diff --git a/src/main/resources/config/application-dev-ws.properties b/src/main/resources/config/application-dev-ws.properties
index 5f63b1b0..1299fd10 100644
--- a/src/main/resources/config/application-dev-ws.properties
+++ b/src/main/resources/config/application-dev-ws.properties
@@ -25,7 +25,7 @@ sebserver.webservice.clean-db-on-startup=false
 # webservice configuration
 sebserver.init.adminaccount.gen-on-init=false
 sebserver.webservice.distributed=false
-sebserver.webservice.http.scheme=http
+sebserver.webservice.http.external.scheme=http
 sebserver.webservice.http.external.servername=
 sebserver.webservice.http.external.port=${server.port}
 sebserver.webservice.http.redirect.gui=/gui
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
index 54584a1c..d762160d 100644
--- a/src/main/resources/config/application.properties
+++ b/src/main/resources/config/application.properties
@@ -86,7 +86,7 @@ sebserver.webservice.internalSecret=${sebserver.password}
 
 ### webservice networking
 sebserver.webservice.distributed=false
-sebserver.webservice.http.scheme=http
+sebserver.webservice.http.external.scheme=https
 sebserver.webservice.http.external.servername=
 sebserver.webservice.http.external.port=
 sebserver.webservice.http.redirect.gui=/gui
diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
index 922b354c..acc8a0d9 100644
--- a/src/test/resources/application-test.properties
+++ b/src/test/resources/application-test.properties
@@ -13,7 +13,7 @@ spring.datasource.platform=test
 spring.flyway.enabled=false
 
 sebserver.init.adminaccount.gen-on-init=false
-sebserver.webservice.http.scheme=http
+sebserver.webservice.http.external.scheme=http
 sebserver.webservice.http.redirect.gui=/gui
 sebserver.webservice.api.admin.clientId=testClient
 sebserver.webservice.api.admin.clientSecret=testClient