From 58ce5b2e862630f8266b3bcfca40a02b5d3bb706 Mon Sep 17 00:00:00 2001
From: Wes Appler <wes@opentech.fund>
Date: Thu, 12 Mar 2026 13:45:58 -0400
Subject: [PATCH 1/2] Added a button to disable 2FA for a specific user

---
 .../users/templates/wagtailusers/users/edit.html    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/hypha/apply/users/templates/wagtailusers/users/edit.html b/hypha/apply/users/templates/wagtailusers/users/edit.html
index 752f5bf9b8..2ab84cdb20 100644
--- a/hypha/apply/users/templates/wagtailusers/users/edit.html
+++ b/hypha/apply/users/templates/wagtailusers/users/edit.html
@@ -1,4 +1,17 @@
 {% extends "wagtailusers/users/edit.html" %}
+{% load users_tags i18n %}
+
+{% block actions %}
+    {{ block.super }}
+    {% user_2fa_enabled user as is_2fa_enabled %}
+    {% if is_2fa_enabled %}
+        <a class="button serious button-longrunning" href="{% url 'users:admin_disable' user.pk %}">
+            {% trans "Disable 2FA" %}
+        </a>
+    {% else %}
+        <button type="button" title="{% trans "This account do not have 2FA enabled." %}" class="button" disabled>{% trans "2FA is disabled" %}</button>
+    {% endif %}
+{% endblock %}
 
 {% block extra_fields %}
     <li>{% include "wagtailadmin/shared/field.html" with field=form.full_name %}</li>

From 2faff1ca3902bacd4624b4e0fb88a2fdca8ef562 Mon Sep 17 00:00:00 2001
From: Wes Appler <wes@opentech.fund>
Date: Thu, 12 Mar 2026 13:55:22 -0400
Subject: [PATCH 2/2] typo fix

---
 hypha/apply/users/templates/wagtailusers/users/edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hypha/apply/users/templates/wagtailusers/users/edit.html b/hypha/apply/users/templates/wagtailusers/users/edit.html
index 2ab84cdb20..dcf7bf28ec 100644
--- a/hypha/apply/users/templates/wagtailusers/users/edit.html
+++ b/hypha/apply/users/templates/wagtailusers/users/edit.html
@@ -9,7 +9,7 @@
             {% trans "Disable 2FA" %}
         </a>
     {% else %}
-        <button type="button" title="{% trans "This account do not have 2FA enabled." %}" class="button" disabled>{% trans "2FA is disabled" %}</button>
+        <button type="button" title="{% trans "This account does not have 2FA enabled." %}" class="button" disabled>{% trans "2FA is disabled" %}</button>
     {% endif %}
 {% endblock %}