diff --git a/spirit/core/tags/settings.py b/spirit/core/tags/settings.py
index a9c2e6a04..764df7ff3 100644
--- a/spirit/core/tags/settings.py
+++ b/spirit/core/tags/settings.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from ..conf import settings as st_settings
+from spirit.core.conf import settings as st_settings
 
 from .registry import register
 
 
 @register.simple_tag(takes_context=True)
 def load_settings(context, *settings):
-    context['st_settings'] = {
+    context.setdefault('st_settings', {}).update({
         setting: getattr(st_settings, setting)
-        for setting in settings}
+        for setting in settings})
     return ''
diff --git a/spirit/user/auth/templates/spirit/user/auth/password_reset_complete.html b/spirit/user/auth/templates/spirit/user/auth/password_reset_complete.html
index a958c94e7..aa7efaee3 100644
--- a/spirit/user/auth/templates/spirit/user/auth/password_reset_complete.html
+++ b/spirit/user/auth/templates/spirit/user/auth/password_reset_complete.html
@@ -2,7 +2,8 @@
 
 {% extends "spirit/_base.html" %}
 
-{% load i18n %}
+{% load spirit_tags i18n %}
+{% load_settings 'LOGIN_URL' %}
 
 {% block title %}{% trans 'Password change successful' %}{% endblock %}
 
@@ -10,7 +11,7 @@
   <div class="layout__article">
     <h1 class="headline">{% trans 'Password change successful' %}</h1>
 
-    <p><a href="{% url LOGIN_URL %}"
+    <p><a href="{% url st_settings.LOGIN_URL %}"
     >{% trans 'Continue to login' %}</a></p>
   </div>
 {% endblock %}
diff --git a/spirit/user/auth/views.py b/spirit/user/auth/views.py
index 4c6e84fe8..8a90554f8 100644
--- a/spirit/user/auth/views.py
+++ b/spirit/user/auth/views.py
@@ -38,7 +38,6 @@ class _CustomPasswordResetConfirmView(django_views.PasswordResetConfirmView):
 
 class _CustomPasswordResetCompleteView(django_views.PasswordResetCompleteView):
     template_name = 'spirit/user/auth/password_reset_complete.html'
-    extra_context = {'LOGIN_URL': settings.LOGIN_URL}
 
 
 class _CustomPasswordResetDoneView(django_views.PasswordResetDoneView):