diff --git a/webgoat-lessons/challenge/src/main/resources/html/Challenge.html b/webgoat-lessons/challenge/src/main/resources/html/Challenge.html
index 00c0e2c2f..b5a072d9b 100644
--- a/webgoat-lessons/challenge/src/main/resources/html/Challenge.html
+++ b/webgoat-lessons/challenge/src/main/resources/html/Challenge.html
@@ -3,10 +3,40 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <div class="lesson-page-wrapper">
-    <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
-    <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
-    which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-    <div class="adoc-content" th:replace="doc:Challenge_content1.adoc"></div>
+    <div class="adoc-content" th:replace="doc:Challenge_introduction.adoc"></div>
 </div>
 
+<div class="lesson-page-wrapper">
+    <div class="attack-container">
+        <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <img th:src="@{/images/webgoat2.png}" class="img-thumbnail"/>
+            </div>
+            <div class="panel-body">
+                <form class="attack-form" accept-charset="UNKNOWN"
+                      method="POST" name="form"
+                      action="/WebGoat/challenge/1"
+                      style="width: 200px;"
+                      enctype="application/json;charset=UTF-8">
+
+                    <div class="form-group">
+                        <label for="exampleInputEmail1" th:text="#{username}">Username</label>
+                        <input autofocus="dummy_for_thymeleaf_parser" type="text" class="form-control"
+                               id="exampleInputEmail1" placeholder="Username" name='username' value="admin"/>
+                    </div>
+                    <div class="form-group">
+                        <label for="exampleInputPassword1" th:text="#{password}">Password</label>
+                        <input type="password" class="form-control" id="exampleInputPassword1"
+                               placeholder="Password"
+                               name='password'/>
+                    </div>
+                    <button class="btn btn-primary btn-block" type="submit" th:text="#{sign.in}">Sign in</button>
+                </form>
+                <div class="attack-feedback"></div>
+                <div class="attack-output"></div>
+            </div>
+        </div>
+    </div>
+</div>
 </html>
\ No newline at end of file
diff --git a/webgoat-lessons/challenge/src/main/resources/images/webgoat2.png b/webgoat-lessons/challenge/src/main/resources/images/webgoat2.png
new file mode 100644
index 000000000..c53a1f75b
Binary files /dev/null and b/webgoat-lessons/challenge/src/main/resources/images/webgoat2.png differ
diff --git a/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_1.adoc b/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_1.adoc
new file mode 100644
index 000000000..b1d8e837f
--- /dev/null
+++ b/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_1.adoc
@@ -0,0 +1,9 @@
+== Welcome to the WebGoat challenge (CTF)
+
+In this CTF you will need to solve a couple of challenges, each challenge will give you a flag which you will
+need to post in order to gain points.
+Flags have the following format: a7179f89-906b-4fec-9d99-f15b796e7208
+
+
+Have fun!!
+Team WebGoat
\ No newline at end of file
diff --git a/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_content1.adoc b/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_content1.adoc
deleted file mode 100644
index 987f45684..000000000
--- a/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_content1.adoc
+++ /dev/null
@@ -1 +0,0 @@
-This is the challenge
\ No newline at end of file
diff --git a/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_introduction.adoc b/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_introduction.adoc
new file mode 100644
index 000000000..b1d8e837f
--- /dev/null
+++ b/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_introduction.adoc
@@ -0,0 +1,9 @@
+== Welcome to the WebGoat challenge (CTF)
+
+In this CTF you will need to solve a couple of challenges, each challenge will give you a flag which you will
+need to post in order to gain points.
+Flags have the following format: a7179f89-906b-4fec-9d99-f15b796e7208
+
+
+Have fun!!
+Team WebGoat
\ No newline at end of file
diff --git a/webgoat-server/pom.xml b/webgoat-server/pom.xml
index 8dff0cda9..78d55dff2 100644
--- a/webgoat-server/pom.xml
+++ b/webgoat-server/pom.xml
@@ -86,11 +86,11 @@
             <artifactId>webgoat-container</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.owasp.webgoat.lesson</groupId>-->
-            <!--<artifactId>challenge</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.owasp.webgoat.lesson</groupId>
+            <artifactId>challenge</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.owasp.webgoat.lesson</groupId>
             <artifactId>client-side-filtering</artifactId>
