diff --git a/src/main/resources/config/application-e2e.properties b/src/main/resources/config/application-e2e.properties
index 130bd3bbb..a5c0b2a34 100644
--- a/src/main/resources/config/application-e2e.properties
+++ b/src/main/resources/config/application-e2e.properties
@@ -1,155 +1 @@
-sebserver.test.property=This is the e2e Setup
-
-
-server.address=localhost
-server.port=8080
-server.servlet.context-path=/
-server.tomcat.uri-encoding=UTF-8
-server.http2.enabled=true
-
-logging.level.ROOT=WARN
-logging.level.ch=INFO
-#logging.level.org.springframework.cache=DEBUG
-#logging.level.ch.ethz.seb.sebserver.webservice.weblayer.oauth=DEBUG
-#logging.level.ch.ethz.seb.sebserver.webservice.servicelayer=DEBUG
-
-logging.level.ch.ethz.seb.sebserver.webservice.servicelayer.session=DEBUG
-
-###### GUI Properties
-########################################################################################################################
-sebserver.gui.http.external.scheme=http
-sebserver.gui.entrypoint=/gui
-sebserver.gui.webservice.protocol=http
-sebserver.gui.webservice.address=localhost
-sebserver.gui.webservice.port=8080
-sebserver.gui.webservice.apipath=/admin-api/v1
-# defines the polling interval that is used to poll the webservice for client connection data on a monitored exam page
-sebserver.gui.webservice.poll-interval=1000
-
-sebserver.gui.theme=css/sebserver.css
-sebserver.gui.list.page.size=15
-
-sebserver.gui.multilingual=false
-sebserver.gui.supported.languages=en,de
-sebserver.gui.date.displayformat=en
-
-sebserver.gui.seb.client.config.download.filename=SEBServerSettings.seb
-sebserver.gui.seb.exam.config.download.filename=SEBExamSettings.seb
-
-###### Webservice Properties
-########################################################################################################################
-
-# data source configuration
-spring.datasource.initialize=true
-spring.datasource.initialization-mode=always
-spring.datasource.url=jdbc:mariadb://localhost:3306/SEBServer?createDatabaseIfNotExist=true&verifyServerCertificate=false&useSSL=false&requireSSL=false
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.flyway.enabled=true
 spring.flyway.locations=classpath:config/sql/base,classpath:config/sql/e2e
-spring.flyway.cleanDisabled=false
-spring.datasource.hikari.initializationFailTimeout=30000
-spring.datasource.hikari.connectionTimeout=30000
-spring.datasource.hikari.idleTimeout=600000
-spring.datasource.hikari.maxLifetime=1800000
-spring.datasource.hikari.maximumPoolSize=10
-spring.datasource.hikari.leakDetectionThreshold=2000
-
-sebserver.http.client.connect-timeout=15000
-sebserver.http.client.connection-request-timeout=10000
-sebserver.http.client.read-timeout=60000
-sebserver.webservice.distributed.updateInterval=1000
-sebserver.webservice.distributed.connectionUpdate=2000
-sebserver.webservice.clean-db-on-startup=false
-
-sebserver.init.database.integrity.try-fix=true
-
-# webservice setup configuration
-sebserver.init.adminaccount.gen-on-init=false
-sebserver.webservice.light.setup=false
-sebserver.webservice.distributed=false
-#sebserver.webservice.master.delay.threshold=10000
-sebserver.webservice.http.external.scheme=http
-sebserver.webservice.http.external.servername=localhost
-sebserver.webservice.http.external.port=${server.port}
-sebserver.webservice.http.redirect.gui=/gui
-sebserver.webservice.ping.service.strategy=BLOCKING
-
-
-sebserver.webservice.api.admin.endpoint=/admin-api/v1
-sebserver.webservice.api.admin.accessTokenValiditySeconds=3600
-sebserver.webservice.api.admin.refreshTokenValiditySeconds=-1
-sebserver.webservice.api.admin.exam.app.signature.key.enabled=true
-sebserver.webservice.api.exam.config.init.permittedProcesses=config/initialPermittedProcesses.xml
-sebserver.webservice.api.exam.config.init.prohibitedProcesses=config/initialProhibitedProcesses.xml
-sebserver.webservice.api.exam.time-prefix=0
-sebserver.webservice.api.exam.time-suffix=0
-sebserver.webservice.api.exam.endpoint=/exam-api
-sebserver.webservice.api.exam.endpoint.discovery=${sebserver.webservice.api.exam.endpoint}/discovery
-sebserver.webservice.api.exam.endpoint.v1=${sebserver.webservice.api.exam.endpoint}/v1
-sebserver.webservice.api.exam.enable-indicator-cache=true
-sebserver.webservice.api.exam.defaultPingInterval=1000
-sebserver.webservice.api.pagination.maxPageSize=500
-# comma separated list of known possible OpenEdX API access token request endpoints
-sebserver.webservice.lms.openedx.api.token.request.paths=/oauth2/access_token
-sebserver.webservice.lms.moodle.api.token.request.paths=
-sebserver.webservice.lms.address.alias=lms.mockup.com=lms.address.alias
-sebserver.webservice.cache.moodle.course.pageSize=250
-
-# actuator configuration
-#management.server.port=${server.port}
-#management.endpoints.web.base-path=/management
-#management.endpoints.web.exposure.include=logfile,loggers,jolokia
-#management.endpoints.web.path-mapping.jolokia=jmx
-### Open API Documentation
-springdoc.api-docs.enabled=true
-springdoc.swagger-ui.enabled=true
-springdoc.swagger-ui.oauth.clientId=guiClient
-springdoc.swagger-ui.oauth.clientSecret=${sebserver.password}
-#springdoc.consumes-to-match=application/json,application/x-www-form-urlencoded
-#springdoc.default-consumes-media-type=application/x-www-form-urlencoded
-springdoc.paths-to-exclude=/sebserver/error,/sebserver/check,/oauth
-
-# features
-
-sebserver.feature.exam.seb.screenProctoring.enabled=true
-sebserver.feature.exam.seb.screenProctoring.bundled=true
-sebserver.feature.exam.seb.screenProctoring.bundled.url=http://localhost:8090
-sebserver.feature.exam.seb.screenProctoring.bundled.clientId=sebserverClient
-sebserver.feature.exam.seb.screenProctoring.bundled.sebserveraccount.username=SEBServerAPIAccount
-
-#sebserver.feature.admin.user.administration.enabled=false
-#sebserver.feature.admin.user.account.enabled=false
-#sebserver.feature.admin.institution.enabled=false
-#sebserver.feature.admin.auditlogs.enabled=false
-#
-#sebserver.feature.config.connection.configuration.enabled=false
-#sebserver.feature.config.exam.configuration.enabled=false
-#sebserver.feature.config.template.enabled=false
-#sebserver.feature.config.certificate.enabled=false
-#
-#sebserver.feature.lms.setup.type.ANS_DELFT.enabled=false
-#sebserver.feature.lms.setup.type.OLAT.enabled=false
-#
-#sebserver.feature.exam.ask.enabled=false
-#sebserver.feature.exam.seb.restriction.enabled=false
-
-#sebserver.feature.exam.seb.screenProctoring.enabled=false
-#sebserver.feature.exam.monitoring.indicators.enabled=false
-#sebserver.feature.exam.connection.config.enabled=false
-#sebserver.feature.exam.seb.clientgroups.enabled=false
-#
-#sebserver.feature.exam.template.enabled=false
-#sebserver.feature.exam.noLMS.enabled=false
-#
-#sebserver.feature.monitoring.running.exam.quit.enabled=false
-#sebserver.feature.monitoring.running.exam.lockscreen.enabled=false
-#sebserver.feature.monitoring.running.exam.cancel.connection.enabled=false
-#sebserver.feature.monitoring.running.exam.state.filter.enabled=false
-#
-#sebserver.feature.monitoring.running.exams.enabled=false
-#sebserver.feature.monitoring.finished.exams.enabled=false
-#sebserver.feature.monitoring.overall.export.enabled=false
-#
-#sebserver.feature.lms.quiz.lookup.enabled=false
-#sebserver.feature.exam.administration.enabled=false
-#sebserver.feature.lms.setup.enabled=false
\ No newline at end of file
diff --git a/src/main/resources/config/sql/e2e/V200__insert_e2e_data.sql b/src/main/resources/config/sql/e2e/V200__insert_e2e_data.sql
index e52f1092e..9d9749347 100644
--- a/src/main/resources/config/sql/e2e/V200__insert_e2e_data.sql
+++ b/src/main/resources/config/sql/e2e/V200__insert_e2e_data.sql
@@ -12,24 +12,24 @@ INSERT IGNORE INTO institution VALUES
 -- Users
 INSERT IGNORE INTO user VALUES
 -- main accounts
-    (1000,1,'create-tests','2019-01-01','Create','Tests', 'createtests','$2a$08$Dzh71858PJsv6mlU3DBkpudWXgA2YWz8YLq4RmAgUZqbrgvEAM5S.','create-tests@alreadyexists.ch','en','UTC',1,1,1),
-    (1001,1,'test-main','2019-01-01','Test','Main', 'testmain','$2a$08$5Y8viI2/TH9jy13Uo1Jq8Oj7.xw.8kQaMPXnCutnet6eqdBaJGQiG','test-main@main.nomail','en','UTC',1,1,1),
+    (1000,11,'create-tests','2019-01-01','Create','Tests', 'createtests','$2a$08$Dzh71858PJsv6mlU3DBkpudWXgA2YWz8YLq4RmAgUZqbrgvEAM5S.','create-tests@alreadyexists.ch','en','UTC',1,1,1),
+    (1001,11,'test-main','2019-01-01','Test','Main', 'testmain','$2a$08$5Y8viI2/TH9jy13Uo1Jq8Oj7.xw.8kQaMPXnCutnet6eqdBaJGQiG','test-main@main.nomail','en','UTC',1,1,1),
 
 -- active tests accounts
-    (1002,1,'seb-inst-admin-inactive','2019-01-01','Institutional','', 'admininactive','$2a$08$HW9A7NsGM8P0.L2JWBwUUeaCjuSZkVc3QLi7KK/nRfIiONnDnzbFW','inst-admin-inactive@nomail.nomail','de','UTC',0,1,1),
-    (1003,1,'seb-inst-admin-active','2019-01-01','Institutional','', 'adminactive','$2a$08$lvYhunSE1uPNYTJa6wLeAeXaK7mI5Yf/xOVAVItBhMPs9T90Eda4C','inst-admin-active@nomail.nomail','en','UTC',1,1,1),
+    (1002,11,'seb-inst-admin-inactive','2019-01-01','Institutional','', 'admininactive','$2a$08$HW9A7NsGM8P0.L2JWBwUUeaCjuSZkVc3QLi7KK/nRfIiONnDnzbFW','inst-admin-inactive@nomail.nomail','de','UTC',0,1,1),
+    (1003,11,'seb-inst-admin-active','2019-01-01','Institutional','', 'adminactive','$2a$08$lvYhunSE1uPNYTJa6wLeAeXaK7mI5Yf/xOVAVItBhMPs9T90Eda4C','inst-admin-active@nomail.nomail','en','UTC',1,1,1),
 
 -- accounts for other institutions
-    (1004,2,'testinst-exam-admin','2019-01-01','Admin','Admin', 'testinstitutionadmin','$2a$08$zBpW9dadK.C3kOjbowKYVOFmWIiqsZMWeWjYqLZxzG8FEliRuOHnC','exam-admin@testinst.nomail','de','UTC',1,1,1),
-    (1005,3,'ethz-exam-admin','2019-01-01','Admin','Admin', 'ethzadmin','$2a$08$6.hUxPZ5rV7jReAitJgakOz/8LfhiUuVKa6.T3Vi5BuHW4oWgvsx6','exam-admin@testinst.nomail','de','UTC',1,1,1),
+    (1004,12,'testinst-exam-admin','2019-01-01','Admin','Admin', 'testinstitutionadmin','$2a$08$zBpW9dadK.C3kOjbowKYVOFmWIiqsZMWeWjYqLZxzG8FEliRuOHnC','exam-admin@testinst.nomail','de','UTC',1,1,1),
+    (1005,13,'ethz-exam-admin','2019-01-01','Admin','Admin', 'ethzadmin','$2a$08$6.hUxPZ5rV7jReAitJgakOz/8LfhiUuVKa6.T3Vi5BuHW4oWgvsx6','exam-admin@testinst.nomail','de','UTC',1,1,1),
 
 
 -- developer accounts
-    (1006,1,'andrei.dev','2019-01-01','Andrei','Mititelu', 'amititelu','$2a$08$TF22iN3Bo7fW4xzUH8DBM.OSXEMq9/ajdivZYJvOAAbr2ntj.7Owa','andrei@nomail.ch','en','Europe/Zurich',1,1,1),
-    (1007,1,'andreas.dev','2019-01-01','Andreas','Hefti', 'ahefti','$2a$08$wQn0mMwbjKaY3OGHK8PBP.iShNZI4Mg5Vumsj7JMyGgd3dcfwqUHK','andreas@nomail.ch','de','Europe/Zurich',1,1,1),
-    (1008,1,'kristina.dev','2019-01-01','Kristina','Isacson', 'kisacson','$2a$08$C6byU6wh0GMI8LXJtGtUu.gXaJr8GqtQ2utz7bT9J2jOUXUxJ1hD6','kristina@nomail.ch','de','Europe/Zurich',1,1,1),
-    (1009,1,'ensar.dev','2019-01-01','Ensar','Mersini', 'emersini','$2a$08$yVMkKbzimIqXD4v9rmT9d.huPtqmDa6HQLu8CLw4jJvWjp6IzdU82','ensar@nomail.ch','de','Europe/Zurich',1,1,1),
-    (1010,1,'risvin.dev','2019-01-01','Risvin','Thambiah', 'rthambiah','$2a$08$dYVkRSYFgYIHoUSGQe7S..jpDCYmwNoaoYf7soxpXJnQhsP2qyw9O','risvin@nomail.ch','de','Europe/Zurich',1,1,1);
+    (1006,11,'andrei.dev','2019-01-01','Andrei','Mititelu', 'amititelu','$2a$08$TF22iN3Bo7fW4xzUH8DBM.OSXEMq9/ajdivZYJvOAAbr2ntj.7Owa','andrei@nomail.ch','en','Europe/Zurich',1,1,1),
+    (1007,11,'andreas.dev','2019-01-01','Andreas','Hefti', 'ahefti','$2a$08$wQn0mMwbjKaY3OGHK8PBP.iShNZI4Mg5Vumsj7JMyGgd3dcfwqUHK','andreas@nomail.ch','de','Europe/Zurich',1,1,1),
+    (1008,11,'kristina.dev','2019-01-01','Kristina','Isacson', 'kisacson','$2a$08$C6byU6wh0GMI8LXJtGtUu.gXaJr8GqtQ2utz7bT9J2jOUXUxJ1hD6','kristina@nomail.ch','de','Europe/Zurich',1,1,1),
+    (1009,11,'ensar.dev','2019-01-01','Ensar','Mersini', 'emersini','$2a$08$yVMkKbzimIqXD4v9rmT9d.huPtqmDa6HQLu8CLw4jJvWjp6IzdU82','ensar@nomail.ch','de','Europe/Zurich',1,1,1),
+    (1010,11,'risvin.dev','2019-01-01','Risvin','Thambiah', 'rthambiah','$2a$08$dYVkRSYFgYIHoUSGQe7S..jpDCYmwNoaoYf7soxpXJnQhsP2qyw9O','risvin@nomail.ch','de','Europe/Zurich',1,1,1);
 
 
 -- User Roles