diff --git a/src/main/resources/application-webgoat.properties b/src/main/resources/application-webgoat.properties
index a2283b488..89f4389ab 100644
--- a/src/main/resources/application-webgoat.properties
+++ b/src/main/resources/application-webgoat.properties
@@ -36,10 +36,6 @@ logging.level.org.hidbernate.SQL=INFO
 webgoat.server.directory=${user.home}/.webgoat-${webgoat.build.version}/
 webgoat.user.directory=${user.home}/.webgoat-${webgoat.build.version}/
 webgoat.build.version=@project.version@
-webgoat.email=webgoat@owasp.org
-webgoat.emaillist=owasp-webgoat@lists.owasp.org
-webgoat.feedback.address=webgoat@owasp.org
-webgoat.feedback.address.html=<A HREF=mailto:webgoat@owasp.org>webgoat@owasp.org</A>
 webgoat.database.connection.string=jdbc:hsqldb:mem:{USER}
 webgoat.default.language=en
 webgoat.url=http://${server.address}:${server.port}${server.servlet.context-path}
diff --git a/src/main/resources/webgoat/templates/main_new.html b/src/main/resources/webgoat/templates/main_new.html
index a9d250fc6..d2a0d1869 100644
--- a/src/main/resources/webgoat/templates/main_new.html
+++ b/src/main/resources/webgoat/templates/main_new.html
@@ -139,16 +139,12 @@
                     data-toggle="modal" data-target="#about-modal">
                 <i class="fa fa-info"></i>
             </button>
-            <!-- mailto menu item -->
-            <a th:href="'mailto:' + ${@environment.getProperty('webgoat.email')} + '?Subject=Webgoat%20feedback'" target="_top">
-                <button type="button" class="btn btn-default right_nav_button" data-toggle="tooltip"
-                        th:title="#{contact}">
-                    <i class="fa fa-envelope"></i>
+            <!-- GitHub menu item -->
+            <a th:href="@{https://github.com/WebGoat/WebGoat}" target="_blank">
+                <button type="button" class="btn btn-default right_nav_button" data-toggle="tooltip">
+                    <i class="fa fa-github"></i>
                 </button>
             </a>
-
-
-
         </div>
     </header>