diff --git a/server/core/templates/registration/password_reset_confirm.html b/server/core/templates/registration/password_reset_confirm.html
index bdc3fbd6..decaf110 100644
--- a/server/core/templates/registration/password_reset_confirm.html
+++ b/server/core/templates/registration/password_reset_confirm.html
@@ -10,14 +10,7 @@
 
         <form method="post" class="mt-1">
         {% csrf_token %}
-        <div>
-            {{ form.new_password1.label_tag }}
-            {{ form.new_password1 }}
-        </div>
-        <div>
-            {{ form.new_password2.label_tag }}
-            {{ form.new_password2 }}
-        </div>
+        {{ form.as_p }}
         <button class="btn mt-1" type="submit" name="action">{% trans 'Passwort zurücksetzen' %}</button>
     </form>
 {% endblock %}
diff --git a/server/core/templates/registration/set_password_confirm.html b/server/core/templates/registration/set_password_confirm.html
index 395607aa..dcd5aeba 100644
--- a/server/core/templates/registration/set_password_confirm.html
+++ b/server/core/templates/registration/set_password_confirm.html
@@ -10,14 +10,8 @@
 
         <form method="post" class="mt-1">
         {% csrf_token %}
-        <div>
-            {{ form.new_password1.label_tag }}
-            {{ form.new_password1 }}
-        </div>
-        <div>
-            {{ form.new_password2.label_tag }}
-            {{ form.new_password2 }}
-        </div>
+        {{ form.as_p }}
+
         <button class="btn mt-1" type="submit" name="action">{% trans 'Passwort speichern' %}</button>
     </form>
 {% endblock %}
diff --git a/server/core/urls.py b/server/core/urls.py
index 7a97c9cc..3d08fe01 100644
--- a/server/core/urls.py
+++ b/server/core/urls.py
@@ -20,7 +20,7 @@ urlpatterns = [
     path('welcome/', SetPasswordView.as_view(), name='set_password'),
     path('set-password/done/', SetPasswordDoneView.as_view(), name='set_password_done'),
     path('set-password/<uidb64>/<token>/', SetPasswordConfirmView.as_view(), name='set_password_confirm'),
-    path('set-password/done/', SetPasswordCompleteView.as_view(), name='set_password_complete'),
+    path('set-password/complete/', SetPasswordCompleteView.as_view(), name='set_password_complete'),
 
     # wagtail
     url(r'^cms/', include(wagtailadmin_urls)),