diff --git a/build.gradle b/build.gradle
index ba3c58e..b63b910 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'war'
 apply plugin: 'application'
 
 group = 'de.jottyfan.camporganizer'
-version = '0.1.7'
+version = '0.1.8'
 sourceCompatibility = 17
 mainClassName = "de.jottyfan.camporganizer.Main"
 
diff --git a/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java b/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java
index de6eb8d..1328ae0 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/registration/KeycloakRepository.java
@@ -1,9 +1,7 @@
 package de.jottyfan.camporganizer.module.registration;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
diff --git a/src/main/resources/templates/registration/registration.html b/src/main/resources/templates/registration/registration.html
index a618bdd..c8423ea 100644
--- a/src/main/resources/templates/registration/registration.html
+++ b/src/main/resources/templates/registration/registration.html
@@ -22,17 +22,17 @@
 							<div class="row">
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('surname')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="Vorname" th:field="*{forename}" th:class="${#fields.hasErrors('forename') ? 'inputerror' : 'form-control'}" />
+									<input type="text" placeholder="Vorname" th:field="*{forename}" th:class="${'form-control ' + (#fields.hasErrors('forename') ? 'inputerror' : '')}" />
 								</div>
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('forename')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="Nachname" th:field="*{surname}" th:class="${#fields.hasErrors('surname') ? 'inputerror' : 'form-control'}" />
+									<input type="text" placeholder="Nachname" th:field="*{surname}" th:class="${'form-control ' + (#fields.hasErrors('surname') ? 'inputerror' : '')}" />
 								</div>
 							</div>
 							<div class="row">
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('sex')}">[[${error}]]<br /></span>
-									<select th:field="*{sex}" th:class="${#fields.hasErrors('sex') ? 'inputerror' : 'form-select'}">
+									<select th:field="*{sex}" th:class="${'form-select ' + (#fields.hasErrors('sex') ? 'inputerror' : '')}">
 										<option value="">Geschlecht</option>
 										<option value="female">weiblich</option>
 										<option value="male">männlich</option>
@@ -40,31 +40,31 @@
 								</div>
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('birthDate')}">[[${error}]]<br /></span>
-									<input type="date" placeholder="Geburtsdatum" th:field="*{birthDate}" th:class="${#fields.hasErrors('birthDate') ? 'inputerror' : 'form-control'}" />
+									<input type="date" placeholder="Geburtsdatum" th:field="*{birthDate}" th:class="${'form-control ' + (#fields.hasErrors('birthDate') ? 'inputerror' : '')}" />
 								</div>
 							</div>
 							<div class="row">
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('street')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="Straße und Hausnummer" th:field="*{street}" th:class="${#fields.hasErrors('street') ? 'inputerror' : 'form-control'}" />
+									<input type="text" placeholder="Straße und Hausnummer" th:field="*{street}" th:class="${'form-control ' + (#fields.hasErrors('street') ? 'inputerror' : '')}" />
 								</div>
 								<div class="col-sm-2 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('zip')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="PLZ" th:field="*{zip}" th:class="${#fields.hasErrors('zip') ? 'inputerror' : 'form-control'}" />
+									<input type="text" placeholder="PLZ" th:field="*{zip}" th:class="${'form-control ' + (#fields.hasErrors('zip') ? 'inputerror' : '')}" />
 								</div>
 								<div class="col-sm-4 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('city')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="Ort" th:field="*{city}" th:class="${#fields.hasErrors('city') ? 'inputerror' : 'form-control'}" />
+									<input type="text" placeholder="Ort" th:field="*{city}" th:class="${'form-control ' + (#fields.hasErrors('city') ? 'inputerror' : '')}" />
 								</div>
 							</div>
 							<div class="row">
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('email')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="E-Mail" th:field="*{email}" th:class="${#fields.hasErrors('email') ? 'inputerror' : 'form-control'}" />
+									<input type="text" placeholder="E-Mail" th:field="*{email}" th:class="${'form-control ' + (#fields.hasErrors('email') ? 'inputerror' : '')}" />
 								</div>
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('phone')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="Telefonnummer" th:field="*{phone}" th:class="${#fields.hasErrors('phone') ? 'inputerror' : 'form-control'}" />
+									<input type="text" placeholder="Telefonnummer" th:field="*{phone}" th:class="${'form-control' + (#fields.hasErrors('phone') ? 'inputerror' : '')}" />
 								</div>
 							</div>
 							<div class="row">
@@ -73,7 +73,7 @@
 								</div>
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('campRole')}">[[${error}]]<br /></span>
-									<select th:field="*{campRole}" th:class="${#fields.hasErrors('campRole') ? 'inputerror' : 'form-select'}">
+									<select th:field="*{campRole}" th:class="${'form-select' + (#fields.hasErrors('campRole') ? 'inputerror' : '')}">
 										<option value="student">Teilnehmer</option>
 										<option value="teacher">Mitarbeiter</option>
 										<option value="feeder">Küchenteam</option>
@@ -97,11 +97,11 @@
 							<div id="createlogin" class="row" th:if="${#strings.isEmpty(currentUser)}">
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('login')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="Login" th:field="*{login}" th:class="${#fields.hasErrors('login') ? 'inputerror' : 'form-control'}" />
+									<input type="text" placeholder="Login" th:field="*{login}" th:class="${'form-control ' + (#fields.hasErrors('login') ? 'inputerror' : '')}" />
 								</div>
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('password')}">[[${error}]]<br /></span>
-									<input type="password" placeholder="Passwort" th:field="*{password}" th:class="${#fields.hasErrors('password') ? 'inputerror' : 'form-control'}" />
+									<input type="password" placeholder="Passwort" th:field="*{password}" th:class="${'form-control ' + (#fields.hasErrors('password') ? 'inputerror' : '')}" />
 								</div>
 							</div>
 							<div class="row">