diff --git a/src/main/java/org/owasp/webgoat/controller/Start.java b/src/main/java/org/owasp/webgoat/controller/Start.java
index 89d734aef..efaa1ce5f 100644
--- a/src/main/java/org/owasp/webgoat/controller/Start.java
+++ b/src/main/java/org/owasp/webgoat/controller/Start.java
@@ -56,6 +56,9 @@ public class Start {
 
         String contactEmail = servletContext.getInitParameter("email");
         model.addObject("contactEmail", contactEmail);
+        String emailList = servletContext.getInitParameter("emaillist");
+        model.addObject("emailList", emailList);
+
         Application app = Application.getInstance();
         logger.info("Setting application properties: " + app);
         model.addObject("version", app.getVersion());
diff --git a/src/main/webapp/WEB-INF/pages/about.jsp b/src/main/webapp/WEB-INF/pages/about.jsp
index 5a34019d7..cbf3a5fcf 100644
--- a/src/main/webapp/WEB-INF/pages/about.jsp
+++ b/src/main/webapp/WEB-INF/pages/about.jsp
@@ -10,24 +10,27 @@
     </div>
     <div class="modal-body modal-scroll">
         <p>Thanks for hacking The Goat!</p> 
-		<p>WebGoat is a demonstration of common web application flaws. The
-        associated exercises are intended to provide hands-on experience with
-        techniques aimed at demonstrating and testing application penetration.
+        <p>WebGoat is a demonstration of common web application flaws. The
+            associated exercises are intended to provide hands-on experience with
+            techniques aimed at demonstrating and testing application penetration.
         </p>
-		<p>From the entire WebGoat team, we appreciate your interest and efforts
-        in making applications not just better, but safer and more secure for
-        everyone. We, as well as our sacrificial goat, thank you.</p>
-        <p>Version: 6.0</p>
+        <p>From the entire WebGoat team, we appreciate your interest and efforts
+            in making applications not just better, but safer and more secure for
+            everyone. We, as well as our sacrificial goat, thank you.</p>
+        <p>
+            Version: ${version},&nbsp;Build: ${build}
+        </p>
+
         <div class="row">
-          <div class="col-md-6">
-              <p>Contact us:
-              <ul>
-                  <li>WebGoat mailing list: owasp-webgoat@lists.owasp.org</li>
-                  <li>Bruce Mayhew:  webgoat@owasp.org</li>
-              </ul>
-              </p>
-          </div>
- 		</div>       
+            <div class="col-md-6">
+                <p>Contact us:
+                <ul>
+                    <li>WebGoat mailing list: ${emailList}</li>
+                    <li>Bruce Mayhew:  ${contactEmail}</li>
+                </ul>
+                </p>
+            </div>
+        </div>       
         <div class="row">
             <div class="col-md-6">
                 <p>WebGoat Authors
@@ -86,9 +89,9 @@
                 </ul>
                 </p>
                 <p>Did we miss you? Our sincere apologies, as we know there have
-                been many contributors over the years. If your name does not
-                appear in any of the lists above, please send us a note. We'll
-                get you added with no further sacrifices required.</p>
+                    been many contributors over the years. If your name does not
+                    appear in any of the lists above, please send us a note. We'll
+                    get you added with no further sacrifices required.</p>
             </div>
         </div>
     </div>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 5748f87ff..9a2869c79 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -27,12 +27,19 @@
     -->
     <context-param>
         <param-name>email</param-name>
-        <param-value>WebGoat@owasp.org</param-value>
+        <param-value>webgoat@owasp.org</param-value>
         <description>
             The EMAIL address of the administrator to whom questions
             and comments about this application should be addressed.
         </description>
     </context-param>
+    <context-param>
+         <param-name>emaillist</param-name>
+        <param-value>owasp-webgoat@lists.owasp.org</param-value>
+        <description>
+            The EMAIL address of the webgoat email list
+        </description>
+    </context-param>
     <!-- spring MVC -->
     <context-param>
         <param-name>contextConfigLocation</param-name>