diff --git a/webapp/lesson_content.jsp b/webapp/lesson_content.jsp
index 5f68051c1..771cccca5 100644
--- a/webapp/lesson_content.jsp
+++ b/webapp/lesson_content.jsp
@@ -2,8 +2,8 @@
          import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.Category, org.owasp.webgoat.lessons.AbstractLesson, org.owasp.webgoat.util.*, java.util.*" 
          errorPage=""  %>
 <%
-    Course course = ((Course) session.getAttribute("course"));
-    WebSession webSession = ((WebSession) session.getAttribute("websession"));
+    WebSession webSession = ((WebSession) session.getAttribute(WebSession.SESSION));
+    Course course = webSession.getCourse();
     AbstractLesson currentLesson = webSession.getCurrentLesson();
 %>
 
diff --git a/webapp/main.jsp b/webapp/main.jsp
index 25cfbb4e6..04dba86ca 100644
--- a/webapp/main.jsp
+++ b/webapp/main.jsp
@@ -2,8 +2,8 @@
          import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.Category, org.owasp.webgoat.lessons.AbstractLesson, org.owasp.webgoat.util.*, java.util.*" 
          errorPage=""  %>
 <%
-    Course course = ((Course) session.getAttribute("course"));
-    WebSession webSession = ((WebSession) session.getAttribute("websession"));
+    WebSession webSession = ((WebSession) session.getAttribute(WebSession.SESSION));
+    Course course = webSession.getCourse();
     AbstractLesson currentLesson = webSession.getCurrentLesson();
 %>