diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/LoginController.java b/prototype/src/main/java/org/hso/ecommerce/controller/LoginController.java
index 0138257..94182ce 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/LoginController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/LoginController.java
@@ -35,19 +35,19 @@ public class LoginController {
 
 		Optional<User> user = userRepository.findByEmail(username);
 		if (!user.isPresent()) {
-			request.setAttribute("error", "Email Adresse falsch.");
+			request.setAttribute("error", "Die Email Adresse falsch.");
 			response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
 			return "login";
 		}
 
 		if (!user.get().validatePassword(password)) {
-			request.setAttribute("error", "Passwort falsch.");
+			request.setAttribute("error", "Das Passwort ist falsch.");
 			response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
 			return "login";
 		}
 
 		if (!user.get().isActive) {
-			request.setAttribute("error", "User ist deaktiviert.");
+			request.setAttribute("error", "Dieses Konto ist deaktiviert..");
 			response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
 			return "login";
 		}
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java b/prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
index b58099d..36fcdef 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
@@ -31,13 +31,13 @@ public class RegisterController {
 			HttpSession session) {
 		Optional<User> user = userRepository.findByEmail(username);
 		if (user.isPresent()) {
-			request.setAttribute("error", "Email Adresse existiert bereits!");
+			request.setAttribute("error", "Die Email Adresse existiert bereits.");
 			response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
 			return "register";
 		}
 
 		if (!password.equals(password2)) {
-			request.setAttribute("error", "Passwörter sind nicht gleich");
+			request.setAttribute("error", "Die Passwörter stimmen nicht überein.");
 			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 			return "register";
 		}
diff --git a/prototype/src/main/resources/templates/register.html b/prototype/src/main/resources/templates/register.html
index a2ef401..de4b839 100644
--- a/prototype/src/main/resources/templates/register.html
+++ b/prototype/src/main/resources/templates/register.html
@@ -56,9 +56,9 @@
             </div>
             <fieldset>
             <input type="radio" id="type-priv" name="type" value="priv">
-            <label for="male">Ich bin Privatkunde</label><br>
+            <label for="type-priv">Ich bin Privatkunde</label><br>
             <input type="radio" id="type-bus" name="type" value="bus">
-            <label for="female">Ich bin Geschäftskunde</label><br>
+            <label for="type-bus">Ich bin Geschäftskunde</label><br>
             </fieldset>
             <div>
             <h2> Werbung </h2>
@@ -66,9 +66,9 @@
             <div>
             <fieldset>
             <input type="radio" id="ad-y" name="ad" value="y">
-            <label for="age1">Ich möchte Werbung erhalten.</label><br>
+            <label for="ad-y">Ich möchte Werbung erhalten.</label><br>
             <input type="radio" id="ad-n" name="ad" value="n">
-            <label for="age2">Ich möchte keine Werbung erhalten.</label><br>  
+            <label for="ad-n">Ich möchte keine Werbung erhalten.</label><br>  
             </fieldset>
             </div>
             <div>