diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index 6ba39b4cb..45bfea76f 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -567,6 +567,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
         link.append(getScreenId());
         link.append("/");
         link.append(getCategory().getRanking());
+
         return link.toString();
     }
 
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonMenuService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonMenuService.java
index 3c7f0cbb4..562feb20e 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonMenuService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonMenuService.java
@@ -113,7 +113,7 @@ public class LessonMenuService extends BaseService {
                             LessonMenuItem stageItem = new LessonMenuItem();
                             stageItem.setName("Stage " + stageIdx + ": " + stage);
                             // build the link for the stage
-                            String stageLink = lessonLink + "&stage=" + stageIdx;
+                            String stageLink = lessonLink + "/" + stageIdx;
                             stageItem.setLink(stageLink);
                             stageItem.setType(LessonMenuItemType.STAGE);
                             if (rla.isStageComplete(ws, stage)) {
diff --git a/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js b/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js
index 8a16b09bb..2e7ce1fa4 100644
--- a/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js
+++ b/webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js
@@ -39,13 +39,13 @@ define(['jquery',
 			this.start = function() {
 				this.listenTo(this.lessonContent,'contentLoaded',this.onContentLoaded);
 			};
-
 			//load View, which can pull data
-			this.loadLesson = function(scr,menu) {
+			this.loadLesson = function(scr,menu,stage) {
 				this.helpsLoaded = {};
 				this.lessonContent.loadData({
-					'screen': encodeURIComponent(scr),
-					'menu': encodeURIComponent(menu),
+					'screen': scr,
+					'menu': menu,
+					'stage': stage
 				});
 				this.planView = {};
 				this.solutionView = {};
diff --git a/webgoat-container/src/main/webapp/js/goatApp/model/LessonContentModel.js b/webgoat-container/src/main/webapp/js/goatApp/model/LessonContentModel.js
index b0301cd6a..f0f0f1dbe 100644
--- a/webgoat-container/src/main/webapp/js/goatApp/model/LessonContentModel.js
+++ b/webgoat-container/src/main/webapp/js/goatApp/model/LessonContentModel.js
@@ -16,13 +16,14 @@ define(['jquery',
 		initialize: function (options) {
 			this.screenParam = null;
 			this.menuParam = null;
+			this.stageParam = null;
 			this.baseUrlRoot = 'attack?Screen=';
 		},
 		loadData: function(options) {
-			this.urlRoot = this.baseUrlRoot  +options.screen + '&menu=' + options.menu;
+			this.urlRoot = this.baseUrlRoot  +options.screen + '&menu=' + options.menu + '&stage=' + options.stage;
 			this.set('menuParam',options.menu);
 			this.set('screenParam',options.screen);
-
+			this.set('stageParam',options.stage)
 			var self=this;
 			this.fetch().then(function(data) {
 				self.setContent(data);
diff --git a/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js b/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js
index 07cf17eb9..94a2be160 100644
--- a/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js
+++ b/webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js
@@ -16,7 +16,7 @@ define(['jquery',
         routes: {
             //#....
             'welcome':'welcomeRoute',
-            'attack/:scr/:menu':'attackRoute' //
+            'attack/:scr/:menu(/:stage)':'attackRoute' //
         },
 
         lessonController: new LessonController({
@@ -33,8 +33,8 @@ define(['jquery',
             this.lessonController.start();
             this.menuController.initMenu();
 
-            goatRouter.on('route:attackRoute', function(scr,menu) {
-                this.lessonController.loadLesson(scr,menu);
+            goatRouter.on('route:attackRoute', function(scr,menu,stage) {
+                this.lessonController.loadLesson(scr,menu,stage);
                 this.menuController.updateMenu(scr,menu);
                 //update menu
             });