diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java
index e2a659d03..c4ef193d2 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java	
@@ -141,7 +141,7 @@ public class LessonSource extends HammerHead
 	}
 	if (source == null)
 	{
-	    return "Source code is not available. Contact webgoat@g2-inc.com";
+	    return "Source code is not available. Contact " + s.getWebgoatContext().getFeedbackAddress();
 	}
 	return (source.replaceAll("(?s)" + START_SOURCE_SKIP + ".*"
 		+ END_SOURCE_SKIP, "Code Section Deliberately Omitted"));
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java
index bba7c5a28..5279991d6 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java	
@@ -544,11 +544,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
 
 	Head head = new Head();
 	head.addElement(new Title(getSourceFileName()));
-	head.addElement(new StringElement(
-		"<meta name=\"Author\" content=\"Bruce Mayhew\">"));
-	head
-		.addElement(new StringElement(
-			"<link rev=\"made\" href=\"mailto:webgoat@g2-inc.com\">"));
 
 	Body body = new Body();
 	body.addElement(new StringElement(src));
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatContext.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatContext.java
index e23118517..a7fcbef3e 100755
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatContext.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatContext.java	
@@ -52,7 +52,7 @@ public class WebgoatContext {
 
 	private boolean enterprise = false;
 
-	private String feedbackAddress = "<A HREF=mailto:webgoat@g2-inc.com>webgoat@g2-inc.com</A>";
+	private String feedbackAddress = "<A HREF=mailto:webgoat@owasp.org>webgoat@owasp.org</A>";
 
 	private boolean isDebug = false;
 
diff --git a/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml b/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml
index 55695194f..e488f348e 100644
--- a/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml	
+++ b/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml	
@@ -36,7 +36,7 @@
 
     <context-param>
       <param-name>email</param-name>
-      <param-value>WebGoat@g2-inc.com</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.
diff --git a/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml b/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml
index 55695194f..e488f348e 100644
--- a/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml	
+++ b/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml	
@@ -36,7 +36,7 @@
 
     <context-param>
       <param-name>email</param-name>
-      <param-value>WebGoat@g2-inc.com</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.
diff --git a/ webgoat/main/project/WebContent/WEB-INF/web.xml b/ webgoat/main/project/WebContent/WEB-INF/web.xml
index 55695194f..e488f348e 100755
--- a/ webgoat/main/project/WebContent/WEB-INF/web.xml	
+++ b/ webgoat/main/project/WebContent/WEB-INF/web.xml	
@@ -36,7 +36,7 @@
 
     <context-param>
       <param-name>email</param-name>
-      <param-value>WebGoat@g2-inc.com</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.