diff --git a/mnemosyne/mnemosyne/templates/mnemosyne/landing.html b/mnemosyne/mnemosyne/templates/mnemosyne/landing.html
index 81e3030..529d7d7 100644
--- a/mnemosyne/mnemosyne/templates/mnemosyne/landing.html
+++ b/mnemosyne/mnemosyne/templates/mnemosyne/landing.html
@@ -19,7 +19,7 @@
                 Your personal knowledge library — organise, embed, and retrieve
                 content across books, music, film, art, and journals.
             </p>
-            <a href="{% url 'login' %}" class="btn btn-primary btn-lg">Log In</a>
+            <a href="{% url 'account_login' %}" class="btn btn-primary btn-lg">Log In</a>
         </div>
     </div>
 </div>
diff --git a/mnemosyne/mnemosyne/templates/registration/logged_out.html b/mnemosyne/mnemosyne/templates/registration/logged_out.html
index 7b72519..f1ea188 100644
--- a/mnemosyne/mnemosyne/templates/registration/logged_out.html
+++ b/mnemosyne/mnemosyne/templates/registration/logged_out.html
@@ -8,7 +8,7 @@
         <div class="card-body items-center text-center">
             <h2 class="card-title text-2xl mb-4">You have been logged out</h2>
             <p class="mb-6 text-base-content/70">Thanks for using {{ themis_app_name }}.</p>
-            <a href="{% url 'login' %}" class="btn btn-primary">Log In Again</a>
+            <a href="{% url 'account_login' %}" class="btn btn-primary">Log In Again</a>
         </div>
     </div>
 </div>
diff --git a/mnemosyne/mnemosyne/templates/registration/login.html b/mnemosyne/mnemosyne/templates/registration/login.html
index 2550753..9df1c99 100644
--- a/mnemosyne/mnemosyne/templates/registration/login.html
+++ b/mnemosyne/mnemosyne/templates/registration/login.html
@@ -19,7 +19,7 @@
             </div>
             {% endif %}
 
-            <form method="post" action="{% url 'login' %}">
+            <form method="post" action="{% url 'account_login' %}">
                 {% csrf_token %}
 
                 <div class="form-control mb-4">
@@ -40,7 +40,7 @@
                            class="input input-bordered w-full{% if form.errors %} input-error{% endif %}"
                            required>
                     <label class="label">
-                        <a href="{% url 'password_reset' %}" class="label-text-alt link link-hover">
+                        <a href="{% url 'account_reset_password' %}" class="label-text-alt link link-hover">
                             Forgot password?
                         </a>
                     </label>
diff --git a/mnemosyne/mnemosyne/templates/registration/password_reset_complete.html b/mnemosyne/mnemosyne/templates/registration/password_reset_complete.html
index f5d6f08..8fa933c 100644
--- a/mnemosyne/mnemosyne/templates/registration/password_reset_complete.html
+++ b/mnemosyne/mnemosyne/templates/registration/password_reset_complete.html
@@ -15,7 +15,7 @@
             <p class="text-base-content/70 mb-6">
                 Your password has been set. You can now log in with your new password.
             </p>
-            <a href="{% url 'login' %}" class="btn btn-primary">Log In</a>
+            <a href="{% url 'account_login' %}" class="btn btn-primary">Log In</a>
         </div>
     </div>
 </div>
diff --git a/mnemosyne/mnemosyne/templates/registration/password_reset_confirm.html b/mnemosyne/mnemosyne/templates/registration/password_reset_confirm.html
index a44b6cf..3204c95 100644
--- a/mnemosyne/mnemosyne/templates/registration/password_reset_confirm.html
+++ b/mnemosyne/mnemosyne/templates/registration/password_reset_confirm.html
@@ -70,7 +70,7 @@
                     This password reset link is invalid or has expired.
                     Please request a new one.
                 </p>
-                <a href="{% url 'password_reset' %}" class="btn btn-primary">Request New Link</a>
+                <a href="{% url 'account_reset_password' %}" class="btn btn-primary">Request New Link</a>
             </div>
             {% endif %}
         </div>
diff --git a/mnemosyne/mnemosyne/templates/registration/password_reset_done.html b/mnemosyne/mnemosyne/templates/registration/password_reset_done.html
index b5f3478..d673d1e 100644
--- a/mnemosyne/mnemosyne/templates/registration/password_reset_done.html
+++ b/mnemosyne/mnemosyne/templates/registration/password_reset_done.html
@@ -16,7 +16,7 @@
                 If an account exists with that email address, we've sent password
                 reset instructions. Check your inbox (and spam folder).
             </p>
-            <a href="{% url 'login' %}" class="btn btn-primary">Back to Log In</a>
+            <a href="{% url 'account_login' %}" class="btn btn-primary">Back to Log In</a>
         </div>
     </div>
 </div>
diff --git a/mnemosyne/mnemosyne/templates/registration/password_reset_form.html b/mnemosyne/mnemosyne/templates/registration/password_reset_form.html
index 414b184..237720e 100644
--- a/mnemosyne/mnemosyne/templates/registration/password_reset_form.html
+++ b/mnemosyne/mnemosyne/templates/registration/password_reset_form.html
@@ -48,7 +48,7 @@
             <div class="divider">OR</div>
 
             <div class="text-center">
-                <a href="{% url 'login' %}" class="link link-hover text-sm">Back to Log In</a>
+                <a href="{% url 'account_login' %}" class="link link-hover text-sm">Back to Log In</a>
             </div>
         </div>
     </div>
diff --git a/mnemosyne/themis/templates/themis/includes/navbar.html b/mnemosyne/themis/templates/themis/includes/navbar.html
index 4ae34dd..c3d45e4 100644
--- a/mnemosyne/themis/templates/themis/includes/navbar.html
+++ b/mnemosyne/themis/templates/themis/includes/navbar.html
@@ -55,7 +55,7 @@
         {% include "themis/includes/notification_bell.html" %}
         {% include "themis/includes/user_menu.html" %}
         {% else %}
-        <a href="{% url 'login' %}" class="btn btn-primary btn-sm">Log in</a>
+        <a href="{% url 'account_login' %}" class="btn btn-primary btn-sm">Log in</a>
         {% endif %}
     </div>
 </div>