diff --git a/allauth/templates/mfa/authenticate.html b/allauth/templates/mfa/authenticate.html
index 2d8d38c5dd..10ec5acb21 100644
--- a/allauth/templates/mfa/authenticate.html
+++ b/allauth/templates/mfa/authenticate.html
@@ -1,19 +1,18 @@
 {% extends "account/base.html" %}
-
 {% load i18n %}
-{% load account socialaccount %}
-
-{% block head_title %}{% trans "Sign In" %}{% endblock %}
-
+{% block head_title %}
+    {% trans "Sign In" %}
+{% endblock %}
 {% block content %}
-<h1>{% trans "Two-Factor Authentication" %}</h1>
-
-<p>{% blocktranslate %}Your account is protected by two-factor authentication. Please enter an authenticator code:{% endblocktranslate %}</p>
-
-<form class="authenticate" method="POST" action="{% url 'mfa_authenticate' %}">
-  {% csrf_token %}
-  {{ form.as_p }}
-  <button type="submit">{% trans "Sign In" %}</button>
-</form>
-
+    <h1>{% trans "Two-Factor Authentication" %}</h1>
+    <p>
+        {% blocktranslate %}Your account is protected by two-factor authentication. Please enter an authenticator code:{% endblocktranslate %}
+    </p>
+    <form class="authenticate"
+          method="POST"
+          action="{% url 'mfa_authenticate' %}">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">{% trans "Sign In" %}</button>
+    </form>
 {% endblock %}
diff --git a/allauth/templates/mfa/index.html b/allauth/templates/mfa/index.html
index 772bc8eb49..e26a917190 100644
--- a/allauth/templates/mfa/index.html
+++ b/allauth/templates/mfa/index.html
@@ -1,47 +1,47 @@
 {% extends "account/base.html" %}
-
 {% load i18n %}
-
-{% block head_title %}{% trans "Two-Factor Authentication" %}{% endblock %}
-
+{% block head_title %}
+    {% trans "Two-Factor Authentication" %}
+{% endblock %}
 {% block content %}
-<h1>{% trans "Two-Factor Authentication" %}</h1>
-
-<section class="totp">
-<h2>{% translate "TOTP Authentication" %}</h2>
-
-{% if authenticators.totp %}
-<p>{% translate "TOTP Authentication is active. " %}</p>
-
-<ul class="actions">
-<li><a href="{% url 'mfa_deactivate_totp' %}">{% translate "Deactivate" %}</a></li>
-</ul>
-
-{% else %}
-<p>{% translate "TOTP Authentication is not set up. " %}</p>
-
-<ul class="actions">
-<li><a href="{% url 'mfa_activate_totp' %}">{% translate "Activate" %}</a></li>
-</ul>
-{% endif %}
-</section>
-
-<section class="recovery_codes" %}>
-<h2>{% translate "Recovery Codes" %}</h2>
-
-{% if authenticators.recovery_codes %}
-
-<p>{% blocktranslate with total_count=authenticators.recovery_codes.generate_codes|length count unused_count=authenticators.recovery_codes.get_unused_codes|length %}There is {{ unused_count }} out of {{ total_count }} recovery codes available.{% plural %}There are {{ unused_count }} out of {{ total_count }} recovery codes available.{% endblocktranslate %}</p>
-
-<ul class="actions">
-<li><a href="{% url 'mfa_view_recovery_codes' %}">{% translate "View codes" %}</a></li>
-<li><a href="{% url 'mfa_download_recovery_codes' %}">{% translate "Download codes" %}</a></li>
-<li><a href="{% url 'mfa_generate_recovery_codes' %}">{% translate "Generate new codes" %}</a></li>
-</ul>
-
-{% else %}
-<p>{% translate "No recovery codes set up." %}</p>
-{% endif %}
-</section>
-
+    <h1>{% trans "Two-Factor Authentication" %}</h1>
+    <section class="totp">
+        <h2>{% translate "Authenticator App" %}</h2>
+        {% if authenticators.totp %}
+            <p>{% translate "Authentication using an authenticator app is active." %}</p>
+            <ul class="actions">
+                <li>
+                    <a href="{% url 'mfa_deactivate_totp' %}">{% translate "Deactivate" %}</a>
+                </li>
+            </ul>
+        {% else %}
+            <p>{% translate "An authenticator app is not active." %}</p>
+            <ul class="actions">
+                <li>
+                    <a href="{% url 'mfa_activate_totp' %}">{% translate "Activate" %}</a>
+                </li>
+            </ul>
+        {% endif %}
+    </section>
+    <section class="recovery_codes" %}>
+        <h2>{% translate "Recovery Codes" %}</h2>
+        {% if authenticators.recovery_codes %}
+            <p>
+                {% blocktranslate with total_count=authenticators.recovery_codes.generate_codes|length count unused_count=authenticators.recovery_codes.get_unused_codes|length %}There is {{ unused_count }} out of {{ total_count }} recovery codes available.{% plural %}There are {{ unused_count }} out of {{ total_count }} recovery codes available.{% endblocktranslate %}
+            </p>
+            <ul class="actions">
+                <li>
+                    <a href="{% url 'mfa_view_recovery_codes' %}">{% translate "View codes" %}</a>
+                </li>
+                <li>
+                    <a href="{% url 'mfa_download_recovery_codes' %}">{% translate "Download codes" %}</a>
+                </li>
+                <li>
+                    <a href="{% url 'mfa_generate_recovery_codes' %}">{% translate "Generate new codes" %}</a>
+                </li>
+            </ul>
+        {% else %}
+            <p>{% translate "No recovery codes set up." %}</p>
+        {% endif %}
+    </section>
 {% endblock %}
diff --git a/allauth/templates/mfa/messages/totp_activated.txt b/allauth/templates/mfa/messages/totp_activated.txt
index 6e79fd7db3..46a121e634 100644
--- a/allauth/templates/mfa/messages/totp_activated.txt
+++ b/allauth/templates/mfa/messages/totp_activated.txt
@@ -1,2 +1,2 @@
 {% load i18n %}
-{% blocktrans %}TOTP authentication activated.{% endblocktrans %}
+{% blocktrans %}Authenticator app activated.{% endblocktrans %}
diff --git a/allauth/templates/mfa/messages/totp_deactivated.txt b/allauth/templates/mfa/messages/totp_deactivated.txt
index e7fc1b8e1e..fcf24c1c45 100644
--- a/allauth/templates/mfa/messages/totp_deactivated.txt
+++ b/allauth/templates/mfa/messages/totp_deactivated.txt
@@ -1,2 +1,2 @@
 {% load i18n %}
-{% blocktrans %}TOTP authentication deactivated.{% endblocktrans %}
+{% blocktrans %}Authenticator app deactivated.{% endblocktrans %}
diff --git a/allauth/templates/mfa/recovery_codes/base.html b/allauth/templates/mfa/recovery_codes/base.html
index f1dc5d372f..1c11181d7b 100644
--- a/allauth/templates/mfa/recovery_codes/base.html
+++ b/allauth/templates/mfa/recovery_codes/base.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-
 {% load i18n %}
-
-{% block head_title %}{% trans "Recovery Codes" %}{% endblock %}
+{% block head_title %}
+    {% trans "Recovery Codes" %}
+{% endblock %}
diff --git a/allauth/templates/mfa/recovery_codes/generate.html b/allauth/templates/mfa/recovery_codes/generate.html
index 7f8fdb3208..a45a6b87fc 100644
--- a/allauth/templates/mfa/recovery_codes/generate.html
+++ b/allauth/templates/mfa/recovery_codes/generate.html
@@ -1,15 +1,13 @@
 {% extends "mfa/recovery_codes/base.html" %}
-
 {% load i18n %}
-
 {% block content %}
-<h1>{% translate "Recovery Codes" %}</h1>
-
-<p>{% blocktranslate %}You are about to generate a new set of recovery codes for your account. This action will invalidate your existing codes. Are you sure?{% endblocktranslate %}
-<form method="POST" action="{% url 'mfa_generate_recovery_codes' %}">
-  {% csrf_token %}
-  {{ form.as_p }}
-  <button type="submit">{% trans "Generate" %}</button>
-</form>
-
+    <h1>{% translate "Recovery Codes" %}</h1>
+    <p>
+        {% blocktranslate %}You are about to generate a new set of recovery codes for your account. This action will invalidate your existing codes. Are you sure?{% endblocktranslate %}
+    </p>
+    <form method="POST" action="{% url 'mfa_generate_recovery_codes' %}">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">{% trans "Generate" %}</button>
+    </form>
 {% endblock %}
diff --git a/allauth/templates/mfa/recovery_codes/index.html b/allauth/templates/mfa/recovery_codes/index.html
index 72a5064236..4aaca03546 100644
--- a/allauth/templates/mfa/recovery_codes/index.html
+++ b/allauth/templates/mfa/recovery_codes/index.html
@@ -1,23 +1,23 @@
 {% extends "mfa/recovery_codes/base.html" %}
-
 {% load i18n %}
-
 {% block content %}
-<h1>{% translate "Recovery Codes" %}</h1>
-
-<p>{% blocktranslate count unused_count=unused_codes|length %}There is {{ unused_count }} out of {{ total_count }} recovery codes available.{% plural %}There are {{ unused_count }} out of {{ total_count }} recovery codes available.{% endblocktranslate %}</p>
-
-{% if unused_codes %}
-<textarea class="recovery-codes" rows="{{ unused_codes|length }}" readonly>{% for code in unused_codes %}{{ code }}
+    <h1>{% translate "Recovery Codes" %}</h1>
+    <p>
+        {% blocktranslate count unused_count=unused_codes|length %}There is {{ unused_count }} out of {{ total_count }} recovery codes available.{% plural %}There are {{ unused_count }} out of {{ total_count }} recovery codes available.{% endblocktranslate %}
+    </p>
+    {% if unused_codes %}
+        <textarea class="recovery-codes" rows="{{ unused_codes|length }}" readonly>{% for code in unused_codes %}{{ code }}
 {% endfor %}
 </textarea>
-{% endif %}
-
-<ul class="actions">
-    {% if unused_codes %}
-    <li><a href="{% url 'mfa_download_recovery_codes' %}">{% translate "Download codes" %}</a></li>
     {% endif %}
-<li><a href="{% url 'mfa_generate_recovery_codes' %}">{% translate "Generate new codes" %}</a></li>
-</ul>
-
+    <ul class="actions">
+        {% if unused_codes %}
+            <li>
+                <a href="{% url 'mfa_download_recovery_codes' %}">{% translate "Download codes" %}</a>
+            </li>
+        {% endif %}
+        <li>
+            <a href="{% url 'mfa_generate_recovery_codes' %}">{% translate "Generate new codes" %}</a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/allauth/templates/mfa/totp/activate_form.html b/allauth/templates/mfa/totp/activate_form.html
index 707d8a6fb0..4f9e4b3afb 100644
--- a/allauth/templates/mfa/totp/activate_form.html
+++ b/allauth/templates/mfa/totp/activate_form.html
@@ -1,20 +1,18 @@
 {% extends "mfa/totp/base.html" %}
-
 {% load i18n %}
-
 {% block content %}
-<h1>{% trans "Activate TOTP" %}</h1>
-
-{{ totp_svg|safe }}
-
-<form method="POST" action="{% url 'mfa_activate_totp' %}">
-  {% csrf_token %}
-  <p>
-      <label>{% translate "Authenticator secret" %}:</label>
-      <input type="text" disabled="disabled" value="{{ form.secret }}" size="{{ form.secret|length }}">
-  </p>
-  {{ form.as_p }}
-  <button type="submit">{% trans "Activate" %}</button>
-</form>
-
+    <h1>{% trans "Activate Authenticator App" %}</h1>
+    {{ totp_svg|safe }}
+    <form method="POST" action="{% url 'mfa_activate_totp' %}">
+        {% csrf_token %}
+        <p>
+            <label>{% translate "Authenticator secret" %}:</label>
+            <input type="text"
+                   disabled="disabled"
+                   value="{{ form.secret }}"
+                   size="{{ form.secret|length }}">
+        </p>
+        {{ form.as_p }}
+        <button type="submit">{% trans "Activate" %}</button>
+    </form>
 {% endblock %}
diff --git a/allauth/templates/mfa/totp/base.html b/allauth/templates/mfa/totp/base.html
index c5a4015d93..e6b76ddba2 100644
--- a/allauth/templates/mfa/totp/base.html
+++ b/allauth/templates/mfa/totp/base.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-
 {% load i18n %}
-
-{% block head_title %}{% trans "TOTP Authentication" %}{% endblock %}
+{% block head_title %}
+    {% trans "Authenticator App" %}
+{% endblock %}
diff --git a/allauth/templates/mfa/totp/deactivate_form.html b/allauth/templates/mfa/totp/deactivate_form.html
index 7e26b749ae..dc6f0069f2 100644
--- a/allauth/templates/mfa/totp/deactivate_form.html
+++ b/allauth/templates/mfa/totp/deactivate_form.html
@@ -1,16 +1,13 @@
 {% extends "mfa/totp/base.html" %}
-
 {% load i18n %}
-
 {% block content %}
-<h1>{% trans "Deactivate TOTP" %}</h1>
-
-<p>{% blocktranslate %}You are about to remove TOTP based Two-Factor
-Authentication from your account. Are you sure?{% endblocktranslate %}
-<form method="POST" action="{% url 'mfa_deactivate_totp' %}">
-  {% csrf_token %}
-  {{ form.as_p }}
-  <button type="submit">{% trans "Deactivate" %}</button>
-</form>
-
+    <h1>{% trans "Deactivate Authenticator App" %}</h1>
+    <p>
+        {% blocktranslate %}You are about to deactivate authenticator app based authentication. Are you sure?{% endblocktranslate %}
+    </p>
+    <form method="POST" action="{% url 'mfa_deactivate_totp' %}">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">{% trans "Deactivate" %}</button>
+    </form>
 {% endblock %}