diff --git a/config/settings/base.py b/config/settings/base.py
index 1699cd97e..f0158ba1f 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -205,7 +205,6 @@
     "django.middleware.locale.LocaleMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
-    "wagtail_2fa.middleware.VerifyUserMiddleware",
     "wagtail_2fa.middleware.VerifyUserPermissionsMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.common.BrokenLinkEmailsMiddleware",
diff --git a/core/users/templates/wagtailusers/users/create.html b/core/users/templates/wagtailusers/users/create.html
index 8f24efe10..5dd5a6d38 100644
--- a/core/users/templates/wagtailusers/users/create.html
+++ b/core/users/templates/wagtailusers/users/create.html
@@ -1,91 +1,11 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailusers/users/create.html" %}
 {% load wagtailadmin_tags wagtailimages_tags %}
 {% load i18n %}
-{% block content %}
 
-    {% trans "Add user" as add_user_str %}
-    {% include "wagtailadmin/shared/header.html" with title=add_user_str merged=1 icon="user" %}
-
-    <div class="w-tabs" data-tabs>
-        <div class="w-tabs__wrapper">
-            <div role="tablist" class="w-tabs__list">
-                {% trans "Account" as account_text %}
-                {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id='account' title=account_text %}
-                {% trans "Roles" as roles_text %}
-                {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id='roles' title=roles_text %}
-            </div>
-        </div>
-
-        <form action="{% url 'wagtailusers_users:add' %}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
-            <div class="tab-content">
-                {% csrf_token %}
-                <section
-                    id="tab-account"
-                    class="w-tabs__panel"
-                    role="tabpanel"
-                    hidden
-                    aria-labelledby="tab-label-account"
-                >
-                    <ul class="fields">
-                        {% block fields %}
-                            {% if form.separate_username_field %}
-                                <li>
-                                    {% include "wagtailadmin/shared/field.html" with field=form.username_field %}
-                                </li>
-                            {% endif %}
-                            <li>
-                                {% include "wagtailadmin/shared/field.html" with field=form.email %}
-                            </li>
-                            <li>
-                                {% include "wagtailadmin/shared/field.html" with field=form.first_name %}
-                            </li>
-                            <li>
-                                {% include "wagtailadmin/shared/field.html" with field=form.last_name %}
-                            </li>
-                            <!-- {% block extra_fields %}{% endblock extra_fields %} -->
-                            {% if form.password1 %}
-                                <li>
-                                    {% include "wagtailadmin/shared/field.html" with field=form.password1 %}
-                                </li>
-                            {% endif %}
-                            {% if form.password2 %}
-                                <li>
-                                    {% include "wagtailadmin/shared/field.html" with field=form.password2 %}
-                                </li>
-                            {% endif %}
-                        {% endblock fields %}
-
-                        <li>
-                            <a href="#tab-roles" data-tab-trigger class="button">
-                                {% trans "Roles" %}
-                                {% icon name="arrow-right" classname="default" %}
-                            </a>
-                        </li>
-                    </ul>
-                </section>
-                <section
-                    id="tab-roles"
-                    class="w-tabs__panel"
-                    role="tabpanel"
-                    hidden
-                    aria-labelledby="tab-label-roles"
-                >
-                    <ul class="fields">
-                        {% if request.user.is_superuser %}
-                            <li>
-                            {% include "wagtailadmin/shared/field.html" with field=form.is_superuser %}
-                            </li>
-                        {% endif %}
-                        <li>{% include "wagtailadmin/shared/field.html" with field=form.groups %}</li>
-                        <li>{% include "wagtailadmin/shared/field.html" with field=form.collection %}</li>
-                        <li>{% include "wagtailadmin/shared/field.html" with field=form.journal %}</li>
-                        <li><button class="button">{% trans "Add user" %}</button></li>
-                    </ul>
-                </section>
-            </div>
-        </form>
-    </div>
-{% endblock %}
+{% block extra_fields %}
+    <li>{% include "wagtailadmin/shared/field.html" with field=form.collection %}</li>
+    <li>{% include "wagtailadmin/shared/field.html" with field=form.journal %}</li>
+{% endblock extra_fields %}
 
 {% block extra_css %}
     {{ block.super }}
diff --git a/core/users/templates/wagtailusers/users/edit.html b/core/users/templates/wagtailusers/users/edit.html
index 8d7b31a3b..5e9d09f48 100644
--- a/core/users/templates/wagtailusers/users/edit.html
+++ b/core/users/templates/wagtailusers/users/edit.html
@@ -1,106 +1,10 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailusers/users/edit.html" %}
 {% load wagtailimages_tags %}
 {% load i18n %}
-{% block content %}
-
-    {% trans "Editing" as editing_str %}
-    {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=user.get_username merged=1 icon="user" search_results_url=index_results_url %}
-
-    <div class="w-tabs" data-tabs>
-        <div class="w-tabs__wrapper">
-            <div role="tablist" class="w-tabs__list">
-                {% trans "Account" as account_text %}
-                {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id='account' title=account_text %}
-                {% trans "Roles" as roles_text %}
-                {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id='roles' title=roles_text %}
-            </div>
-        </div>
-
-        <form action="{% url 'wagtailusers_users:edit' user.pk %}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
-            <div class="tab-content">
-                {% csrf_token %}
-
-                <section
-                    id="tab-account"
-                    class="w-tabs__panel"
-                    role="tabpanel"
-                    hidden
-                    aria-labelledby="tab-label-account"
-                >
-                    <ul class="fields">
-                        {% block fields %}
-                            {% if form.separate_username_field %}
-                                <li>
-                                    {% include "wagtailadmin/shared/field.html" with field=form.username_field %}
-                                </li>
-                            {% endif %}
-                            <li>
-                                {% include "wagtailadmin/shared/field.html" with field=form.email %}
-                            </li>
-                            <li>
-                                {% include "wagtailadmin/shared/field.html" with field=form.first_name %}
-                            </li>
-                            <li>
-                                {% include "wagtailadmin/shared/field.html" with field=form.last_name %}
-                            </li>
-                            {% block extra_fields %}{% endblock extra_fields %}
-                            {% if form.password1 %}
-                                <li>
-                                    {% include "wagtailadmin/shared/field.html" with field=form.password1 %}
-                                </li>
-                            {% endif %}
-                            {% if form.password2 %}
-                                <li>
-                                    {% include "wagtailadmin/shared/field.html" with field=form.password2 %}
-                                </li>
-                            {% endif %}
-                            {% if form.is_active %}
-                                <li>
-                                    {% include "wagtailadmin/shared/field.html" with field=form.is_active %}
-                                </li>
-                            {% endif %}
-
-                        {% endblock fields %}
-                        <li>
-                            <input type="submit" value="{% trans 'Save' %}" class="button"/>
-                            {% if can_delete %}
-                                <a href="{% url 'wagtailusers_users:delete' user.pk %}" class="button no">{% trans "Delete user" %}</a>
-                            {% endif %}
-                        </li>
-                    </ul>
-                </section>
-                <section
-                    id="tab-roles"
-                    class="w-tabs__panel"
-                    role="tabpanel"
-                    hidden
-                    aria-labelledby="tab-label-roles"
-                >
-                    <ul class="fields">
-                        {% if request.user.is_superuser %}
-                            {% if form.is_superuser %}
-                                <li>
-                                    {% include "wagtailadmin/shared/field.html" with field=form.is_superuser %}
-                                </li>
-                            {% endif %}
-                        {% endif %}
-                        
-                            <li>{% include "wagtailadmin/shared/field.html" with field=form.groups %}</li>
-                            <li>{% include "wagtailadmin/shared/field.html" with field=form.collection %}</li>
-                            <li>{% include "wagtailadmin/shared/field.html" with field=form.journal %}</li>
-                        
-                        <li>
-                            <input type="submit" value="{% trans 'Save' %}" class="button"/>
-                            {% if can_delete %}
-                                <a href="{% url 'wagtailusers_users:delete' user.pk %}" class="button no">{% trans "Delete user" %}</a>
-                            {% endif %}
-                        </li>
-                    </ul>
-                </section>
-            </div>
-        </form>
-    </div>
-{% endblock %}
+{% block extra_fields %}
+    <li>{% include "wagtailadmin/shared/field.html" with field=form.collection %}</li>
+    <li>{% include "wagtailadmin/shared/field.html" with field=form.journal %}</li>
+{% endblock extra_fields %}
 
 {% block extra_css %}
     {{ block.super }}
diff --git a/requirements/base.txt b/requirements/base.txt
index 492087c44..7da57b9f6 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -49,7 +49,7 @@ wagtail==7.1.1  # https://github.com/wagtail/wagtail
 wagtail-django-recaptcha==2.1.1  # https://pypi.org/project/wagtail-django-recaptcha/
 wagtail-localize==1.12.2  # https://github.com/wagtail/wagtail-localize
 wagtail-modeladmin==2.2.0  # https://github.com/wagtail/wagtail-modeladmin
-wagtail-2fa-new==1.8.0  # https://pypi.org/project/wagtail-2fa-new/
+wagtail-2fa==1.7.1  # https://pypi.org/project/wagtail-2fa-new/
 
 # ==============================================================================
 # CACHE & SESSION