diff --git a/certidude/api/__init__.py b/certidude/api/__init__.py
index 7facd0c..7f97fd1 100644
--- a/certidude/api/__init__.py
+++ b/certidude/api/__init__.py
@@ -55,9 +55,13 @@ class SessionResource(object):
                 [req.context.get("remote_addr") in j
                     for j in config.REQUEST_SUBNETS]),
             authority = dict(
+                outbox = dict(
+                    server = config.OUTBOX,
+                    name = config.OUTBOX_NAME,
+                    mail = config.OUTBOX_MAIL
+                ),
                 user_certificate_enrollment=config.USER_CERTIFICATE_ENROLLMENT,
                 user_mutliple_certificates=config.USER_MULTIPLE_CERTIFICATES,
-                outbox = config.OUTBOX,
                 certificate = authority.certificate,
                 events = config.EVENT_SOURCE_SUBSCRIBE % config.EVENT_SOURCE_TOKEN,
                 requests=authority.list_requests(),
diff --git a/certidude/static/views/authority.html b/certidude/static/views/authority.html
index 77b17f5..6f8cd4c 100644
--- a/certidude/static/views/authority.html
+++ b/certidude/static/views/authority.html
@@ -13,17 +13,21 @@ for current user account.</p>
 
 <h2>Authority certificate</h2>
 
-<p>Several things such as CRL location and e-mails are hardcoded into
-the <a href="/api/certificate">certificate</a> and
-as such require complete reset of X509 infrastructure if some of them needs to be changed:</p>
-
-<p>Mails will appear from: {{ session.authority.certificate.email_address }}</p>
-
+<p>Several things are hardcoded into the <a href="/api/certificate">certificate</a> and
+as such require complete reset of X509 infrastructure if some of them needs to be changed.</p>
 
 <h2>Authority settings</h2>
 
 <p>These can be reconfigured via /etc/certidude/server.conf on the server.</p>
 
+{% if session.authority.outbox %}
+    <p>Outgoing mail server: {{ session.authority.outbox.server }}</p>
+    <p>Mails will appear from: {{ session.authority.outbox.name }} &lt;{{ session.authority.outbox.mail }}&gt;</p>
+{% else %}
+    <p>E-mail disabled</p>
+{% endif %}
+
+
 <p>User certificate enrollment:
 {% if session.authority.user_certificate_enrollment %}
     {% if session.authority.user_mutliple_certificates %}
@@ -37,12 +41,6 @@ forbidden
 {% endif %}
 </p>
 
-<p>Outgoing mail server:
-{% if session.authority.outbox %}
-    {{ session.authority.outbox }}
-{% else %}
-    E-mail disabled
-{% endif %}</p>
 
 <p>Web signed certificate attributes:</p>