diff --git a/src/main/webapp/page/admin/data/config/site-setup.yaml b/src/main/webapp/page/admin/data/config/site-setup.yaml
index 1ae704d27feb3ecd8713b6b3b697fa8945a17a68..16bb194cf4ff57d0ba8c6db3c7858155d3017fef 100644
--- a/src/main/webapp/page/admin/data/config/site-setup.yaml
+++ b/src/main/webapp/page/admin/data/config/site-setup.yaml
@@ -2,8 +2,12 @@ initialSetup:
     kind: panel.multiForm
     name: initialSetup
     label: XNAT Initial Setup
-    #method: POST
-    action: '#!'
+    method: POST
+    action: /xapi/siteConfig/batch
+    contentType: json
+    load:
+        lookup: XNAT.data.siteConfig
+        refresh: /xapi/siteConfig
     contents:
 
         setupMessage:
@@ -48,7 +52,11 @@ initialSetup:
                     label: Site URL
                     value: ''
                     placeholder: localhost
-                    description: ''
+                    description: >
+                        The address you want visible to users in emails, and other external links. This should be a
+                        functional address (i.e. if the user pasted this address in their web browser, they should
+                        come to the site). localhost only works if the web browser is located on the same machine.
+                        You are required to guarantee that this address is functional for reaching the site.
                     validation: required url
 
                 adminEmail:
@@ -77,7 +85,7 @@ initialSetup:
 
                 archiveRootPath:
                     kind: panel.input.text
-                    name: archivePath
+                    name: archiveRootPath
                     label: Archive Location
                     size: 50
                     value: ''
@@ -144,6 +152,7 @@ initialSetup:
                     label: Host
                     value: ?? XNAT.data.siteConfig.smtpServer.host
                     placeholder: localhost
+                    validation: required
 
                 port:
                     kind: panel.input.number
@@ -151,6 +160,7 @@ initialSetup:
                     label: Port
                     value: ?? XNAT.data.siteConfig.smtpServer.port
                     placeholder: 25
+                    validation: required number
 
                 username:
                     kind: panel.input.text
@@ -169,3 +179,25 @@ initialSetup:
                     name: protocol
                     label: Protocol
                     value: ?? XNAT.data.siteConfig.smtpServer.protocol
+
+                mailServerProperties:
+                    kind: panel.subhead
+                    text: Mail Server Settings
+
+                smtpAuth:
+                    kind: panel.input.checkbox
+                    name: mail.smtp.auth
+                    label: SMTP Auth?
+                    value: ?? XNAT.data.siteConfig.smtpServer['mail.smtp.auth']
+
+                smtpStartTls:
+                    kind: panel.input.checkbox
+                    name: mail.smtp.starttls.enable
+                    label: Smart TLS?
+                    value: ?? XNAT.data.siteConfig.smtpServer['mail.smtp.starttls.enable']
+
+                smtpSSLTrust:
+                    kind: panel.input.text
+                    name: mail.smtp.ssl.trust
+                    label: SSL Trust
+                    value: ?? XNAT.data.siteConfig.smtpServer['mail.smtp.ssl.trust']