diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java
index d350c25c1..3b838ecf1 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java	
@@ -11,6 +11,7 @@ import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
 import org.apache.ecs.html.H2;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.PRE;
 import org.apache.ecs.html.Span;
 import org.apache.ecs.html.Div;
@@ -64,6 +65,8 @@ public class BackDoors extends LessonAdapter
 
     private final static String SELECT_ST = "select userid, password, ssn, salary from employee where userid=";
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     protected Element createContent(WebSession s)
     {
@@ -259,7 +262,7 @@ public class BackDoors extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 
 
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java
index 34d041d57..0535fc90a 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java	
@@ -14,6 +14,7 @@ import org.apache.ecs.html.A;
 import org.apache.ecs.html.B;
 import org.apache.ecs.html.H1;
 import org.apache.ecs.html.HR;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Input;
 import org.apache.ecs.html.P;
 import org.apache.ecs.html.TD;
@@ -68,6 +69,8 @@ public class CSRF extends LessonAdapter {
 	private static Connection connection = null;
 	private static int count = 1;
 	private final static int USER_COL = 4;	// Added by Chuck Willis - used to show user who posted message
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 	
 	/**
 	 *  Adds a feature to the Message attribute of the MessageBoardScreen object
@@ -325,7 +328,7 @@ public class CSRF extends LessonAdapter {
 
     public Element getCredits()
     {
-    	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+    	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 	
 }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java
index 02a33abc9..e3c366925 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java	
@@ -9,6 +9,7 @@ import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
 import org.apache.ecs.html.BR;
 import org.apache.ecs.html.H1;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Input;
 import org.apache.ecs.html.TD;
 import org.apache.ecs.html.TR;
@@ -55,6 +56,8 @@ public class DOMInjection extends LessonAdapter
 
     private final static String KEY = "key";
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     protected Element createContent(WebSession s)
     {
@@ -152,7 +155,7 @@ public class DOMInjection extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 
 
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java
index 3d837a3ab..ffc3c0656 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java	
@@ -8,6 +8,7 @@ import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
 import org.apache.ecs.html.BR;
 import org.apache.ecs.html.H1;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Input;
 import org.apache.ecs.html.TD;
 import org.apache.ecs.html.TR;
@@ -52,6 +53,8 @@ public class ForcedBrowsing extends LessonAdapter
 
     private final static String SUCCEEDED = "succeeded";
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     /**
      *  Description of the Method
@@ -153,6 +156,6 @@ public class ForcedBrowsing extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java
index aeab40255..13af6f404 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java	
@@ -55,6 +55,8 @@ public class HttpSplitting extends LessonAdapter
 
     private static String STAGE = "stage";
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     /**
      * Description of the Method
@@ -289,7 +291,7 @@ public class HttpSplitting extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 
 }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java
index 56977a627..4677ce1c8 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java	
@@ -7,6 +7,7 @@ import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
 import org.apache.ecs.html.Div;
 import org.apache.ecs.html.Form;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Table;
 import org.apache.ecs.html.TR;
 import org.apache.ecs.html.TD;
@@ -59,6 +60,8 @@ public class JSONInjection extends LessonAdapter
 
     private final static String TRAVEL_TO = "travelTo";
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     public void handleRequest(WebSession s)
     {
@@ -272,7 +275,7 @@ public class JSONInjection extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 
     protected Category getDefaultCategory()
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java
index 6e3b74883..5fd0581ce 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java	
@@ -56,8 +56,6 @@ public abstract class LessonAdapter extends AbstractLesson
     final static IMG WEBGOAT_LOGO = new IMG("images/logos/WebGoat.jpg").setAlt(
 	    "WebGoat Logo").setBorder(0).setHspace(0).setVspace(0);
 
-    final static IMG AOC_LOGO = new IMG("images/logos/AOC_Logo.jpg").setAlt(
-    "OWASP Autumn of Code").setBorder(0).setHspace(0).setVspace(0);
 
     /**
      *  Description of the Method
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java
index f3f78cdeb..40107c9cd 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java	
@@ -9,6 +9,7 @@ import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
 import org.apache.ecs.HtmlColor;
 import org.apache.ecs.StringElement;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Input;
 import org.apache.ecs.html.PRE;
 import org.apache.ecs.html.TD;
@@ -57,6 +58,8 @@ public class LogSpoofing extends LessonAdapter
 
     private static final String PASSWORD = "password";
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     protected Element createContent(WebSession s)
     {
@@ -166,6 +169,6 @@ public class LogSpoofing extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java
index 9c91e8cc1..d7c893bd2 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java	
@@ -2,6 +2,7 @@ package org.owasp.webgoat.lessons;
 
 import org.apache.ecs.Element;
 import org.apache.ecs.StringElement;
+import org.apache.ecs.html.IMG;
 
 import org.owasp.webgoat.session.WebSession;
 
@@ -39,6 +40,8 @@ import org.owasp.webgoat.session.WebSession;
  */
 public class NewLesson extends LessonAdapter
 {
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     /**
      *  Description of the Method
@@ -86,6 +89,6 @@ public class NewLesson extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java
index 25a9af4b2..e683ea698 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java	
@@ -12,6 +12,7 @@ import org.apache.ecs.html.Div;
 import org.apache.ecs.html.Form;
 import org.apache.ecs.html.H1;
 import org.apache.ecs.html.H3;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Input;
 import org.apache.ecs.html.PRE;
 import org.apache.ecs.html.TD;
@@ -59,6 +60,8 @@ public class SilentTransactions extends LessonAdapter
 
     private final static Double CURRENT_BALANCE = 11987.09;
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     public void handleRequest(WebSession s)
     {
@@ -306,7 +309,7 @@ public class SilentTransactions extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 
 }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java
index 3cc7944be..253794852 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java	
@@ -13,6 +13,7 @@ import org.apache.ecs.html.BR;
 import org.apache.ecs.html.Form;
 import org.apache.ecs.html.H1;
 import org.apache.ecs.html.H3;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Input;
 import org.apache.ecs.html.TD;
 import org.apache.ecs.html.TR;
@@ -63,6 +64,8 @@ public class XMLInjection extends LessonAdapter
 
     public static HashMap rewardsMap = new HashMap();
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     protected static HashMap init()
     {
@@ -321,7 +324,7 @@ public class XMLInjection extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 
 
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java
index 645b66476..acd3a351f 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java	
@@ -20,6 +20,7 @@ import javax.xml.xpath.XPathExpressionException;
 import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
+import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Input;
 import org.apache.ecs.html.P;
 import org.apache.ecs.html.TD;
@@ -77,6 +78,8 @@ public class XPATHInjection extends LessonAdapter
 
     private final static String PASSWORD = "Password";
 
+    private final static IMG MAC_LOGO = new IMG("images/logos/mac_Logo.gif").setAlt(
+    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
 
     protected Element createContent(WebSession s)
     {
@@ -214,7 +217,7 @@ public class XPATHInjection extends LessonAdapter
 
     public Element getCredits()
     {
-	return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO);
+	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
     }
 
 
diff --git a/ webgoat/main/project/WebContent/images/logos/AOC_Logo.jpg b/ webgoat/main/project/WebContent/images/logos/AOC_Logo.jpg
deleted file mode 100644
index 183edbaad..000000000
Binary files a/ webgoat/main/project/WebContent/images/logos/AOC_Logo.jpg and /dev/null differ
diff --git a/ webgoat/main/project/WebContent/images/logos/mac_Logo.gif b/ webgoat/main/project/WebContent/images/logos/mac_Logo.gif
new file mode 100644
index 000000000..78026f3df
Binary files /dev/null and b/ webgoat/main/project/WebContent/images/logos/mac_Logo.gif differ
diff --git a/ webgoat/main/project/WebContent/webgoat.jsp b/ webgoat/main/project/WebContent/webgoat.jsp
index d85af6ee7..6e21d99c6 100644
--- a/ webgoat/main/project/WebContent/webgoat.jsp	
+++ b/ webgoat/main/project/WebContent/webgoat.jsp	
@@ -51,7 +51,9 @@
                   <td height="25" valign="bottom"><div align="center"><span class="style1">Documentation Contributer</span></div></td>
                 </tr>
                 <tr>
-                  <td><div align="center" class="style2">Sherif Koussa<br /></div>
+                  <td><div align="center" class="style2">Sherif Koussa<br />
+                  (http://www.macadamian.com)<br />
+                  </div>
                   </td>
                   <td><div align="center" class="style2">Robert Sullivan<br />
                   (http://www.unitedhealthgroup.com/) </div></td>
@@ -59,7 +61,7 @@
                 <tr>
                   <td><div align="center" class="style2">OWASP Autumn of Code<br />
                   (http://www.owasp.org/) </div></td>
-                  <td><div align="center" class="style2">Sherif Koussa<br /></div>
+                  <td><div align="center" class="style2">Sherif Koussa<br />(http://www.macadamian.com)<br /></div>
                   </td>
                 </tr>
                  <tr>