diff --git a/CTFd/forms/email.py b/CTFd/forms/email.py
index 93cb2ba6..889cfac0 100644
--- a/CTFd/forms/email.py
+++ b/CTFd/forms/email.py
@@ -6,5 +6,5 @@ from CTFd.forms.fields import SubmitField
 
 
 class SendEmailForm(BaseForm):
-    message = TextAreaField("Message", validators=[InputRequired()])
+    text = TextAreaField("Message", validators=[InputRequired()])
     submit = SubmitField("Send")
diff --git a/CTFd/themes/admin/templates/modals/mail/send.html b/CTFd/themes/admin/templates/modals/mail/send.html
index 8971a0bd..621ba8f8 100644
--- a/CTFd/themes/admin/templates/modals/mail/send.html
+++ b/CTFd/themes/admin/templates/modals/mail/send.html
@@ -1,12 +1,12 @@
 {% with form = Forms.email.SendEmailForm() %}
 <form id="user-mail-form" method="POST">
 	<div class="form-group">
-		{{ form.message.label }}
-		{{ form.message(class="form-control", rows="15") }}
+		{{ form.text.label }}
+		{{ form.text(class="form-control", rows="15") }}
 	</div>
 	<div id="results">
 
 	</div>
 	{{ form.submit(class="btn btn-primary float-right") }}
 </form>
-{% endwith %}
\ No newline at end of file
+{% endwith %}