diff --git a/src/admin/templatetags/__init__.py b/src/admin/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/admin/templatetags/template_extras.py b/src/admin/templatetags/template_extras.py
new file mode 100644
index 00000000..ce4c23ae
--- /dev/null
+++ b/src/admin/templatetags/template_extras.py
@@ -0,0 +1,9 @@
+from django.template import Library, loader
+
+register = Library()
+
+
+@register.filter(name='center', is_safe=True, needs_autoescape=False)
+def center(value, arg=""):
+ template = loader.get_template("components/center.html")
+ return template.render({"value": value, "pad": arg})
diff --git a/src/admin/tests.py b/src/admin/tests.py
index c58d54db..69d02c55 100644
--- a/src/admin/tests.py
+++ b/src/admin/tests.py
@@ -1,8 +1,8 @@
import hashlib
-from django.urls import reverse
-from django.test import TestCase
from django.core import mail
+from django.test import TestCase
+from django.urls import reverse
from rest_framework.test import APITestCase
from challenge.models import Category, Challenge
diff --git a/src/templates/2fa_removed.html b/src/templates/2fa_removed.html
index 3381cf3c..32ba673e 100644
--- a/src/templates/2fa_removed.html
+++ b/src/templates/2fa_removed.html
@@ -1,10 +1,10 @@
{% extends "bases/base.html" %}
-{% import "bases/macros.html" as m %}
+{% load template_extras %}
{% block body %}
- {% call m.center() %}
+ {% filter center %}
2FA has been disabled on your account.
If this was you, you can safely ignore this email.
If this wasn't you, request a password reset or raise a support ticket.
- {% endcall %}
+ {% endfilter %}
{% endblock %}
diff --git a/src/templates/2fa_removed.txt b/src/templates/2fa_removed.txt
index f3150c44..871ed65d 100644
--- a/src/templates/2fa_removed.txt
+++ b/src/templates/2fa_removed.txt
@@ -1,3 +1,3 @@
2FA has been disabled on your account.
If this was you, you can safely ignore this email.
-If this wasn't you, request a password reset or raise a support ticket.
\ No newline at end of file
+If this wasn't you, request a password reset or raise a support ticket.
diff --git a/src/templates/bases/macros.html b/src/templates/bases/macros.html
deleted file mode 100644
index f695a9b4..00000000
--- a/src/templates/bases/macros.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% macro button(text, url) -%}
-
-
-
{{ email.body }}
No emails have been sent
{% endfor %}