diff --git a/server/core/templates/registration/password_reset_confirm.html b/server/core/templates/registration/password_reset_confirm.html
index 9edfe96b..23d4485f 100644
--- a/server/core/templates/registration/password_reset_confirm.html
+++ b/server/core/templates/registration/password_reset_confirm.html
@@ -7,7 +7,7 @@
 {% block body %}
 <div class="reset">
     <h2 class="reset__heading">{% trans 'Setzen Sie Ihr neues Passwort' %}</h2>
-    <p class="reset__text">{% trans 'Kein Problem! Geben Sie Ihre E-Mail-Adresse ein und erhalten Sie weitere Anweisungen.' %}</p>
+    <p class="reset__text">{% trans 'Das Passwort muss Grossbuchstaben, Zahlen und Sonderzeichen beinhalten' %}</p>
         <form method="post" class="mt-1 reset__form">
         {% csrf_token %}
         {{ form.as_p }}
diff --git a/server/core/templates/registration/set_password_complete.html b/server/core/templates/registration/set_password_complete.html
index b2ad19e7..32215383 100644
--- a/server/core/templates/registration/set_password_complete.html
+++ b/server/core/templates/registration/set_password_complete.html
@@ -6,7 +6,7 @@
 {% block body %}
 <div class="reset">
     <h2 class="reset__heading">{% trans 'Sie haben es geschafft' %}</h2>
-    <p class="reset__text">% trans 'Ihr Passwort wurde erfolgreich gespeichert. Sie können sich nun anmelden.' %}</p>
+    <p class="reset__text">{% trans 'Ihr Passwort wurde erfolgreich gespeichert. Sie können sich nun anmelden.' %}</p>
     <p class="reset__text"><a href="/login">{% trans 'Jetzt anmelden' %}</a></p>
 </div>
 {% endblock %}
diff --git a/server/core/templates/registration/set_password_confirm.html b/server/core/templates/registration/set_password_confirm.html
index e5181163..123ab041 100644
--- a/server/core/templates/registration/set_password_confirm.html
+++ b/server/core/templates/registration/set_password_confirm.html
@@ -7,7 +7,7 @@
 {% block body %}
 <div class="reset">
     <h2 class="reset__heading">{% trans 'Geben Sie ein persönliches Passwort ein:' %}</h2>
-    <p class="reset__text">{% trans 'Kein Problem! Geben Sie Ihre E-Mail-Adresse ein und erhalten Sie weitere Anweisungen.' %}</p>
+    <p class="reset__text">{% trans 'Das Passwort muss Grossbuchstaben, Zahlen und Sonderzeichen beinhalten.' %}</p>
         <form method="post" class="mt-1 reset__form">
         {% csrf_token %}
         {{ form.as_p }}
diff --git a/server/registration/mutations_public.py b/server/registration/mutations_public.py
index 224b251e..fecf1463 100644
--- a/server/registration/mutations_public.py
+++ b/server/registration/mutations_public.py
@@ -14,7 +14,7 @@ from core.views import SetPasswordView
 from registration.models import License
 from registration.serializers import RegistrationSerializer
 from users.models import User, Role, UserRole, SchoolClass
-from users.mutations_public import MutationError, FieldError
+from users.mutations_public import MutationError, PublicFieldError
 
 
 class Registration(relay.ClientIDMutation):
@@ -73,7 +73,7 @@ class Registration(relay.ClientIDMutation):
         for key, value in serializer.errors.items():
             error = MutationError(field=key, errors=[])
             for field_error in serializer.errors[key]:
-                error.errors.append(FieldError(code=field_error.code))
+                error.errors.append(PublicFieldError(code=field_error.code))
 
             errors.append(error)
 
diff --git a/server/users/mutations_public.py b/server/users/mutations_public.py
index 6236a733..85c5563f 100644
--- a/server/users/mutations_public.py
+++ b/server/users/mutations_public.py
@@ -14,13 +14,13 @@ from django.contrib.auth import authenticate, login
 from graphene import relay
 
 
-class FieldError(graphene.ObjectType):
+class PublicFieldError(graphene.ObjectType):
     code = graphene.String()
 
 
 class MutationError(graphene.ObjectType):
     field = graphene.String()
-    errors = graphene.List(FieldError)
+    errors = graphene.List(PublicFieldError)
 
 
 class Login(relay.ClientIDMutation):