diff --git a/CTFd/templates/original/admin/config.html b/CTFd/templates/original/admin/config.html
index 620c564c..b314f4c9 100644
--- a/CTFd/templates/original/admin/config.html
+++ b/CTFd/templates/original/admin/config.html
@@ -49,6 +49,13 @@
             <div class="tab-content">
                 <div role="tabpanel" class="tab-pane active" id="mailserver">
 
+                    <div class="form-group">
+                        <label for="start">Mail From Address:</label>
+                        <input class="form-control" id='maifrom_addr' name='maifrom_addr' type='text'
+                               placeholder="Email address used to send email"
+                               {% if maifrom_addr is defined and maifrom_addr != None %}value="{{ maifrom_addr }}"{% endif %}>
+                    </div>
+
                     <div class="form-group">
                         <label for="start">Mail Server Address:</label>
                         <input class="form-control" id='mail_server' name='mail_server' type='text'
@@ -90,10 +97,10 @@
                 <div role="tabpanel" class="tab-pane" id="mailgun">
 
                     <div class="form-group">
-                        <label for="start">Mail Server Address:</label>
-                        <input class="form-control" id='mail_server' name='mail_server' type='text'
-                               placeholder="Mail Server Address"
-                               {% if mail_server is defined and mail_server != None %}value="{{ mail_server }}"{% endif %}>
+                        <label for="start">Mail From Address:</label>
+                        <input class="form-control" id='maifrom_addr' name='maifrom_addr' type='text'
+                               placeholder="Email address used to send email"
+                               {% if maifrom_addr is defined and maifrom_addr != None %}value="{{ maifrom_addr }}"{% endif %}>
                     </div>
 
                     <div class="form-group">