diff --git a/src/main/java/org/owasp/webgoat/lessons/model/LessonMenuItem.java b/src/main/java/org/owasp/webgoat/lessons/model/LessonMenuItem.java
index 2b3551565..6fe0be737 100644
--- a/src/main/java/org/owasp/webgoat/lessons/model/LessonMenuItem.java
+++ b/src/main/java/org/owasp/webgoat/lessons/model/LessonMenuItem.java
@@ -44,8 +44,8 @@ public class LessonMenuItem {
     private List<LessonMenuItem> children = new ArrayList<LessonMenuItem>();
     private boolean complete;
     private String link;
-    private boolean showSource;
-    private boolean showHints;
+    private boolean showSource = true;
+    private boolean showHints = true;
 
     /**
      * @return the name
diff --git a/src/main/java/org/owasp/webgoat/service/LessonMenuService.java b/src/main/java/org/owasp/webgoat/service/LessonMenuService.java
index df2973046..3c7f0cbb4 100644
--- a/src/main/java/org/owasp/webgoat/service/LessonMenuService.java
+++ b/src/main/java/org/owasp/webgoat/service/LessonMenuService.java
@@ -86,16 +86,16 @@ public class LessonMenuService extends BaseService {
                 if (lesson.isCompleted(ws)) {
                     lessonItem.setComplete(true);
                 }
+                /* @TODO - do this in a more efficient way 
+                 if (lesson.isAuthorized(ws, role, WebSession.SHOWHINTS)) {
+                 lessonItem.setShowHints(true);
+                 }
 
-                if (lesson.isAuthorized(ws, role, WebSession.SHOWHINTS)) {
-                    lessonItem.setShowHints(true);
-                }
-
-                if (lesson.isAuthorized(ws, role, WebSession.SHOWSOURCE)) {
-                    lessonItem.setShowSource(true);
-                }
-
-                // special handling for challenge role 
+                 if (lesson.isAuthorized(ws, role, WebSession.SHOWSOURCE)) {
+                 lessonItem.setShowSource(true);
+                 }
+                 */
+                // special handling for challenge role
                 if (Category.CHALLENGE.equals(lesson.getCategory())) {
                     lessonItem.setShowHints(lesson.isAuthorized(ws, AbstractLesson.CHALLENGE_ROLE, WebSession.SHOWHINTS));
                     lessonItem.setShowSource(lesson.isAuthorized(ws, AbstractLesson.CHALLENGE_ROLE, WebSession.SHOWHINTS));