diff --git a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
index 2f6be73076..3620e4796c 100644
--- a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
@@ -9,6 +9,7 @@ $(document).on('click', 'section.sa-wrapper input#show', ( ->
       $('section.sa-wrapper p#rubric').append("Your answer: #{answer}")
       $('section.sa-wrapper p#rubric').append(response.rubric)
     else
+      $('section.sa-wrapper input#show').remove()
       $('section.sa-wrapper p#rubric').append(response.message)
 ));
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 9b68136336..a7e9567c8c 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -27,7 +27,8 @@ from xmodule.contentstore.content import XASSET_SRCREF_PREFIX, StaticContent
 log = logging.getLogger("mitx.courseware")
 
 #Set the default number of max attempts.  Should be 1 for production
-max_attempts = 100
+#Set higher for debugging/testing
+max_attempts = 1
 
 def only_one(lst, default="", process=lambda x: x):
     """
@@ -274,6 +275,7 @@ class SelfAssessmentModule(XModule):
 
         state = {'seed': 1,
                  'student_answers': self.answer,
+                 'hint' : self.hint,
                  'correct_map': {'self_assess': {'correctness': self.correctness,
                                                  'npoints': points,
                                                  'msg': "",