diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
index cf64c520b..ef9f0f7fd 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
@@ -70,11 +70,16 @@ public abstract class LessonAdapter extends AbstractLesson {
         ec
                 .addElement(new StringElement(
                         "Lesson are simple to create and very little coding is required.   "
-                                + "In fact, most lessons can be created by following the easy to use instructions in the "
-                                + "<A HREF=http://www.owasp.org/index.php/WebGoat_User_and_Install_Guide_Table_of_Contents>WebGoat User Guide.</A>&nbsp;&nbsp;"
-                                + "If you would prefer, send your lesson ideas to "
-                                + getWebgoatContext().getFeedbackAddressHTML()));
-
+                                + "In fact, most lessons can be created by following the easy to use instructions by going to the WebGoat wiki page&nbsp;"
+                                + "<A HREF=https://github.com/WebGoat/WebGoat/wiki>WebGoat Wiki Page</A>&nbsp;&nbsp;"
+                                + "If you would prefer, send your lesson ideas to&nbsp;"
+                                + getWebgoatContext().getFeedbackAddressHTML())
+                                + " Note: you will need to register at "
+                                + "the following link to use the feedback tool:&nbsp;"
+                                + "<A HREF=https://lists.owasp.org/mailman/listinfo/owasp-webgoat>List Registration</A>&nbsp;&nbsp;"
+                                + "Finally, OWASP has a slack channel. You can register at the following link:&nbsp;"
+                                + "<A HREF=https://owasp.slack.com/>OWASP Slack Channel</A>");
+        
         try (InputStream is = Thread.currentThread().getContextClassLoader()
                 .getResourceAsStream("New Lesson Instructions.txt")) {
             if (is != null) {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java
index 7ab008868..f7e0eca66 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java
@@ -92,9 +92,9 @@ public class WebgoatContext {
 
     private boolean codingExercises = false;
 
-    private String feedbackAddress = "webgoat@owasp.org";
+    private String feedbackAddress = "owasp-webgoat@list.owasp.org";
 
-    private String feedbackAddressHTML = "<A HREF=mailto:webgoat@owasp.org>webgoat@owasp.org</A>";
+    private String feedbackAddressHTML = "<A HREF=mailto:owasp-webgoat@list.owasp.org>owasp-webgoat@list.owasp.org</A>";
 
     private boolean isDebug = false;