diff --git a/openwisp_users/templates/admin/action_confirmation.html b/openwisp_users/templates/admin/action_confirmation.html
index 507c9defc..e7aed5b0d 100644
--- a/openwisp_users/templates/admin/action_confirmation.html
+++ b/openwisp_users/templates/admin/action_confirmation.html
@@ -1,45 +1 @@
-{% extends 'admin/base_site.html' %}
-{% load i18n l10n admin_urls static %}
-
-{% block extrahead %}
-    {{ block.super }}
-    {{ media }}
-    <script src='{% static 'admin/js/cancel.js' %}'></script>
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation
-  delete-selected-confirmation{% endblock %}
-
-{% block breadcrumbs %}
-<div class='breadcrumbs'>
-<a href='{% url 'admin:index' %}'>{% trans 'Home' %}</a>
-&rsaquo; <a href='{% url 'admin:app_list' app_label=opts.app_label %}'>{{ opts.app_config.verbose_name }}</a>
-&rsaquo; <a href='{% url opts|admin_urlname:'changelist' %}'>{{ opts.verbose_name_plural|capfirst }}</a>
-&rsaquo; {% trans 'Modify active status' %}
-</div>
-{% endblock %}
-
-{% block content %}
-  {% if action == 'make_inactive' %}
-    <p>{% blocktrans %}Are you sure you want to make the selected users inactive?{% endblocktrans %}</p>
-  {% else %}
-    <p>{% blocktrans %}Are you sure you want to make the selected users active?{% endblocktrans %}</p>
-  {% endif %}
-  <h2>{% trans "Summary" %}</h2>
-  <ul>
-    {% for user in queryset.all %}
-    <li>{% trans "User" %}: {{ user }}</li>
-    {% endfor %}
-  </ul>
-  <form action='' method='post'>{% csrf_token %}
-    {% for obj in queryset.all %}
-    <input type='hidden' name='_selected_action' value='{{ obj.pk|unlocalize }}'/>
-    {% endfor %}
-    <div class='submit-row'>
-      <input type='hidden' name='action' value='{{ action }}'/>
-      <input type='submit' name='confirmation' value='{% trans "Confirm" %}'/>
-      <a href='#' onclick='window.history.back(); return false;'
-         class='button cancel-link'>{% trans 'No, take me back' %}</a>
-    </div>
-  </form>
-{% endblock %}
+{% extends 'admin/openwisp_users/action_confirmation.html' %}
diff --git a/openwisp_users/templates/admin/login.html b/openwisp_users/templates/admin/login.html
index 1cfca43cf..f3da2a091 100644
--- a/openwisp_users/templates/admin/login.html
+++ b/openwisp_users/templates/admin/login.html
@@ -1,51 +1 @@
-{% extends "admin/login.html" %}
-{% load i18n %}
-{% block content %}
-{% if form.errors and not form.non_field_errors %}
-<p class="errornote">
-{% if form.errors.items|length == 1 %}Please correct the error below{% else %}Please correct the errors below{% endif %}
-</p>
-{% endif %}
-
-{% if form.non_field_errors %}
-{% for error in form.non_field_errors %}
-<p class="errornote">
-    {{ error }}
-</p>
-{% endfor %}
-{% endif %}
-
-<div id="content-main">
-
-{% if user.is_authenticated %}
-<p class="errornote">
-{% block trimmed %}
-    You are authenticated as {{ username }}, but are not authorized to
-    access this page. Would you like to login to a different account?
-{% endblock %}
-</p>
-{% endif %}
-
-<form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
-  <div class="form-row">
-    {{ form.username.errors }}
-    <label class="required" for="id_username">
-      {% trans 'Email, phone number or username' %}:
-    </label>
-    {{ form.username }}
-  </div>
-  <div class="form-row">
-    {{ form.password.errors }}
-    {{ form.password.label_tag }} {{ form.password }}
-    <input type="hidden" name="next" value="{{ next }}" />
-  </div>
-  <div class="form-row">
-    <a href="{% url 'account_reset_password' %}">Forgot Password?</a>
-  </div>
-  <div class="submit-row">
-    <input type="submit" value="Log in" />
-  </div>
-</form>
-
-</div>
-{% endblock %}
+{% extends 'admin/openwisp_users/login.html' %}
diff --git a/openwisp_users/templates/admin/openwisp_users/action_confirmation.html b/openwisp_users/templates/admin/openwisp_users/action_confirmation.html
new file mode 100644
index 000000000..507c9defc
--- /dev/null
+++ b/openwisp_users/templates/admin/openwisp_users/action_confirmation.html
@@ -0,0 +1,45 @@
+{% extends 'admin/base_site.html' %}
+{% load i18n l10n admin_urls static %}
+
+{% block extrahead %}
+    {{ block.super }}
+    {{ media }}
+    <script src='{% static 'admin/js/cancel.js' %}'></script>
+{% endblock %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation
+  delete-selected-confirmation{% endblock %}
+
+{% block breadcrumbs %}
+<div class='breadcrumbs'>
+<a href='{% url 'admin:index' %}'>{% trans 'Home' %}</a>
+&rsaquo; <a href='{% url 'admin:app_list' app_label=opts.app_label %}'>{{ opts.app_config.verbose_name }}</a>
+&rsaquo; <a href='{% url opts|admin_urlname:'changelist' %}'>{{ opts.verbose_name_plural|capfirst }}</a>
+&rsaquo; {% trans 'Modify active status' %}
+</div>
+{% endblock %}
+
+{% block content %}
+  {% if action == 'make_inactive' %}
+    <p>{% blocktrans %}Are you sure you want to make the selected users inactive?{% endblocktrans %}</p>
+  {% else %}
+    <p>{% blocktrans %}Are you sure you want to make the selected users active?{% endblocktrans %}</p>
+  {% endif %}
+  <h2>{% trans "Summary" %}</h2>
+  <ul>
+    {% for user in queryset.all %}
+    <li>{% trans "User" %}: {{ user }}</li>
+    {% endfor %}
+  </ul>
+  <form action='' method='post'>{% csrf_token %}
+    {% for obj in queryset.all %}
+    <input type='hidden' name='_selected_action' value='{{ obj.pk|unlocalize }}'/>
+    {% endfor %}
+    <div class='submit-row'>
+      <input type='hidden' name='action' value='{{ action }}'/>
+      <input type='submit' name='confirmation' value='{% trans "Confirm" %}'/>
+      <a href='#' onclick='window.history.back(); return false;'
+         class='button cancel-link'>{% trans 'No, take me back' %}</a>
+    </div>
+  </form>
+{% endblock %}
diff --git a/openwisp_users/templates/admin/openwisp_users/login.html b/openwisp_users/templates/admin/openwisp_users/login.html
new file mode 100644
index 000000000..ea421b34e
--- /dev/null
+++ b/openwisp_users/templates/admin/openwisp_users/login.html
@@ -0,0 +1,52 @@
+{# Extends Django's built-in admin login template #}
+{% extends "admin/login.html" %}
+{% load i18n %}
+{% block content %}
+{% if form.errors and not form.non_field_errors %}
+<p class="errornote">
+{% if form.errors.items|length == 1 %}Please correct the error below{% else %}Please correct the errors below{% endif %}
+</p>
+{% endif %}
+
+{% if form.non_field_errors %}
+{% for error in form.non_field_errors %}
+<p class="errornote">
+    {{ error }}
+</p>
+{% endfor %}
+{% endif %}
+
+<div id="content-main">
+
+{% if user.is_authenticated %}
+<p class="errornote">
+{% block trimmed %}
+    You are authenticated as {{ username }}, but are not authorized to
+    access this page. Would you like to login to a different account?
+{% endblock %}
+</p>
+{% endif %}
+
+<form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
+  <div class="form-row">
+    {{ form.username.errors }}
+    <label class="required" for="id_username">
+      {% trans 'Email, phone number or username' %}:
+    </label>
+    {{ form.username }}
+  </div>
+  <div class="form-row">
+    {{ form.password.errors }}
+    {{ form.password.label_tag }} {{ form.password }}
+    <input type="hidden" name="next" value="{{ next }}" />
+  </div>
+  <div class="form-row">
+    <a href="{% url 'account_reset_password' %}">Forgot Password?</a>
+  </div>
+  <div class="submit-row">
+    <input type="submit" value="Log in" />
+  </div>
+</form>
+
+</div>
+{% endblock %}
diff --git a/tests/openwisp2/sample_users/templates/admin/action_confirmation.html b/tests/openwisp2/sample_users/templates/admin/action_confirmation.html
new file mode 100644
index 000000000..e7aed5b0d
--- /dev/null
+++ b/tests/openwisp2/sample_users/templates/admin/action_confirmation.html
@@ -0,0 +1 @@
+{% extends 'admin/openwisp_users/action_confirmation.html' %}
diff --git a/tests/openwisp2/sample_users/templates/admin/login.html b/tests/openwisp2/sample_users/templates/admin/login.html
new file mode 100644
index 000000000..f3da2a091
--- /dev/null
+++ b/tests/openwisp2/sample_users/templates/admin/login.html
@@ -0,0 +1 @@
+{% extends 'admin/openwisp_users/login.html' %}
diff --git a/tests/openwisp2/settings.py b/tests/openwisp2/settings.py
index a02f2d64f..a9aca0a80 100644
--- a/tests/openwisp2/settings.py
+++ b/tests/openwisp2/settings.py
@@ -89,14 +89,11 @@
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [
-            os.path.join(os.path.dirname(BASE_DIR), "openwisp_users", "templates")
-        ],
         "OPTIONS": {
             "loaders": [
                 "django.template.loaders.filesystem.Loader",
-                "openwisp_utils.loaders.DependencyLoader",
                 "django.template.loaders.app_directories.Loader",
+                "openwisp_utils.loaders.DependencyLoader",
             ],
             "context_processors": [
                 "django.template.context_processors.debug",