diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java
index 11388d196..07fabc360 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java	
@@ -905,7 +905,12 @@ public class WebSession
 			eatCookies();
 			hintNum = -1;
 		}
-
+		else if (myParser.getRawParameter( STAGE, null ) != null) 
+		{
+			int stage = myParser.getIntParameter(STAGE, getCurrentLesson().getStage(this));
+			if (stage > 0 && stage <= getCurrentLesson().getStageCount())
+				getCurrentLesson().setStage(this, stage);
+		}
 		// else update global variables for the current screen
 		else
 		{
diff --git a/ webgoat/main/project/WebContent/main.jsp b/ webgoat/main/project/WebContent/main.jsp
index 81ccea007..b261471e5 100644
--- a/ webgoat/main/project/WebContent/main.jsp	
+++ b/ webgoat/main/project/WebContent/main.jsp	
@@ -196,6 +196,20 @@ StringBuffer buildList = new StringBuffer();
 				<br/>
 				<a href="javascript:toggle('lessonPlans')" target="_top" onclick="MM_nbGroup('down','group1','plans','',1)">Close this Window</a>
 				</div>
+				<%
+					if (webSession.isDebug()&& webSession.getCurrentLesson().getStageCount() > 1) {
+						%><form method="post" action="attack?menu=<%=webSession.getCurrentMenu()%>">
+						<select name="<%= WebSession.STAGE %>" onchange="this.form.submit();">
+						<%
+						int stages = webSession.getCurrentLesson().getStageCount();
+						int stage = webSession.getCurrentLesson().getStage(webSession);
+						for (int i=1; i<=stages;i++) {
+						%><option <% if (i == stage) out.print("selected"); %> value="<%= i %>">Stage <%= i %></option>
+						<%
+						}
+						%></select></form><%
+					}
+				%>
 				<div id="lessonContent"><%=webSession.getInstructions()%></div>
 				<div id="message" class="info"><%=webSession.getMessage()%></div>