diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index e21de21ca..046d2e603 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -355,6 +355,7 @@ ROOT_URLCONF = "paperless.urls"
 FORCE_SCRIPT_NAME = os.getenv("PAPERLESS_FORCE_SCRIPT_NAME")
 BASE_URL = (FORCE_SCRIPT_NAME or "") + "/"
 LOGIN_URL = BASE_URL + "accounts/login/"
+LOGIN_REDIRECT_URL = "/dashboard"
 LOGOUT_REDIRECT_URL = os.getenv("PAPERLESS_LOGOUT_REDIRECT_URL")
 
 WSGI_APPLICATION = "paperless.wsgi.application"
diff --git a/src/paperless/templates/account/login.html b/src/paperless/templates/account/login.html
index 22e1ff53b..65bd3a27f 100644
--- a/src/paperless/templates/account/login.html
+++ b/src/paperless/templates/account/login.html
@@ -68,7 +68,7 @@
       </div>
       {% if EMAIL_ENABLED %}
       <div class="d-grid mt-3">
-        <a class="btn btn-link" href="{% url 'password_reset' %}">{% translate "Forgot your password?" %}</a>
+        <a class="btn btn-link" href="{% url 'account_reset_password' %}">{% translate "Forgot your password?" %}</a>
       </div>
       {% endif %}
 		</form>
diff --git a/src/documents/templates/registration/password_reset_form.html b/src/paperless/templates/account/password_reset.html
similarity index 96%
rename from src/documents/templates/registration/password_reset_form.html
rename to src/paperless/templates/account/password_reset.html
index 9bdc22943..1b5de5aeb 100644
--- a/src/documents/templates/registration/password_reset_form.html
+++ b/src/paperless/templates/account/password_reset.html
@@ -2,6 +2,7 @@
 
 {% load static %}
 {% load i18n %}
+{% load allauth %}
 
 <html lang="en">
   <head>
@@ -18,7 +19,8 @@
   </head>
 
   <body class="text-center">
-    <form class="form-signin position-absolute top-50 start-50 translate-middle" method="post">
+    {% url 'account_reset_password' as reset_url %}
+    <form class="form-signin position-absolute top-50 start-50 translate-middle" method="post" action="{{reset_url}}">
 			{% csrf_token %}
       <svg xmlns="http://www.w3.org/2000/svg" width="300" class="logo mb-4" viewBox="0 0 2897.4 896.6">
         <path class="leaf" d="M140,713.7c-3.4-16.4-10.3-49.1-11.2-49.1c-145.7-87.1-128.4-238-80.2-324.2C59,449,251.2,524,139.1,656.8 c-0.9,1.7,5.2,22.4,10.3,41.4c22.4-37.9,56-83.6,54.3-87.9C65.9,273.9,496.9,248.1,586.6,39.4c40.5,201.8-20.7,513.9-367.2,593.2 c-1.7,0.9-62.9,108.6-65.5,109.5c0-1.7-25.9-0.9-22.4-9.5C133.1,727.4,136.6,720.6,140,713.7L140,713.7z M135.7,632.6 c44-50.9-7.8-137.9-38.8-166.4C149.5,556.7,146,609.3,135.7,632.6L135.7,632.6z" transform="translate(0)" style="fill:#17541f"/>
@@ -47,7 +49,7 @@
 			{% translate "Email" as i18n_email %}
       <h1></h1>
       <div class="form-floating">
-        <input type="email" name="email" id="inputEmail" placeholder="{{ i18n_email }}" class="form-control" required>
+        <input type="{{form.email.type}}" name="{{form.email.name}}" id="inputEmail" placeholder="{{ i18n_email }}" class="form-control" required>
 			  <label for="inputEmail">{{ i18n_email }}</label>
       </div>
       <div class="d-grid mt-3">
diff --git a/src/documents/templates/registration/password_reset_done.html b/src/paperless/templates/account/password_reset_done.html
similarity index 100%
rename from src/documents/templates/registration/password_reset_done.html
rename to src/paperless/templates/account/password_reset_done.html
diff --git a/src/documents/templates/registration/password_reset_confirm.html b/src/paperless/templates/account/password_reset_from_key.html
similarity index 92%
rename from src/documents/templates/registration/password_reset_confirm.html
rename to src/paperless/templates/account/password_reset_from_key.html
index 8f24212a7..11b40cd22 100644
--- a/src/documents/templates/registration/password_reset_confirm.html
+++ b/src/paperless/templates/account/password_reset_from_key.html
@@ -2,6 +2,7 @@
 
 {% load static %}
 {% load i18n %}
+{% load allauth %}
 
 <html lang="en">
   <head>
@@ -38,7 +39,10 @@
           <path d="M757.6,293.7c-20-10.8-42.6-16.2-67.8-16.2H600c-8.5,39.2-21.1,76.4-37.6,111.3c-9.9,20.8-21.1,40.6-33.6,59.4v207.2h88.9 V521.5h72c25.2,0,47.8-5.4,67.8-16.2s35.7-25.6,47.1-44.2c11.4-18.7,17.1-39.1,17.1-61.3c0.1-22.7-5.6-43.3-17-61.9 C793.3,319.2,777.6,304.5,757.6,293.7z M716.6,434.3c-9.3,8.9-21.6,13.3-36.7,13.3l-62.2,0.4v-92.5l62.2-0.4 c15.1,0,27.3,4.4,36.7,13.3c9.4,8.9,14,19.9,14,32.9C730.6,414.5,726,425.4,716.6,434.3z" transform="translate(0)"/>
         </g>
       </svg>
-      {% if validlink %}
+      {% if token_fail %}
+        {% url 'account_reset_password' as passwd_reset_url %}
+        <p>The password reset link was invalid, possibly because it has already been used. Please <a class="btn btn-link" href="{{passwd_reset_url}}">{% translate "request a new password reset" %}</a>.</p>
+      {% else %}
 			<p>{% translate "Set a new password." %}</p>
 			{% if form.errors %}
         <div class="alert alert-danger" role="alert">
@@ -50,20 +54,16 @@
 			{% translate "Confirm Password" as i18n_new_password2 %}
       <h1></h1>
       <div class="form-floating">
-        <input type="password" name="new_password1" id="inputPassword1" placeholder="{{ i18n_new_password1 }}" class="form-control" required>
+        <input type="password" name="{{form.password1.name}}" id="inputPassword1" placeholder="{{ i18n_new_password1 }}" class="form-control" required>
 			  <label for="inputPassword1">{{ i18n_new_password1 }}</label>
       </div>
       <div class="form-floating">
-        <input type="password" name="new_password2" id="inputPassword2" placeholder="{{ i18n_new_password2 }}" class="form-control" required>
+        <input type="password" name="{{form.password2.name}}" id="inputPassword2" placeholder="{{ i18n_new_password2 }}" class="form-control" required>
 			  <label for="inputPassword2">{{ i18n_new_password2 }}</label>
       </div>
       <div class="d-grid mt-3">
         <button class="btn btn-lg btn-primary" type="submit">{% translate "Change my password" %}</button>
       </div>
-      {% else %}
-
-      <p>The password reset link was invalid, possibly because it has already been used. Please <a class="btn btn-link" href="{% url 'password_reset' %}">{% translate "request a new password reset" %}</a>.</p>
-
       {% endif %}
 		</form>
 	</body>
diff --git a/src/documents/templates/registration/password_reset_complete.html b/src/paperless/templates/account/password_reset_from_key_done.html
similarity index 99%
rename from src/documents/templates/registration/password_reset_complete.html
rename to src/paperless/templates/account/password_reset_from_key_done.html
index d9b0a3b72..5a8370a1b 100644
--- a/src/documents/templates/registration/password_reset_complete.html
+++ b/src/paperless/templates/account/password_reset_from_key_done.html
@@ -38,7 +38,7 @@
           </g>
         </svg>
         <h3>{% translate "Password reset complete." %}</h3>
-        {% url 'login' as login_url %}
+        {% url 'account_login' as login_url %}
         <p>{% blocktranslate %}Your new password has been set. You can now <a href="{{ login_url }}">log in</a>{% endblocktranslate %}.</p>
       </div>
 	</body>
