diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.3.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.3.js
index 09248f6c38..c57817eca5 100644
--- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.3.js
+++ b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.3.js
@@ -148,6 +148,7 @@ function showCompletion() {
     $('body').keydown(function(e) {
         if (e.ctrlKey && e.keyCode == 13) {
             $('#next-courseware-button').click();
+            $('#next-courseware-button').unbind('click');
         }
     });
 }
diff --git a/public/js/main_0.0.2.js b/public/js/main_0.0.2.js
index b0c33c9293..b2791bdaeb 100644
--- a/public/js/main_0.0.2.js
+++ b/public/js/main_0.0.2.js
@@ -154,6 +154,7 @@ $(document).ready(function() {
     'BONFIRE': 5
   };
   $('#next-courseware-button').on('click', function() {
+    $('#next-courseware-button').unbind('click');
     if ($('.signup-btn-nav').length < 1) {
       switch (challengeType) {
         case challengeTypes.HTML_CSS_JQ:
@@ -172,6 +173,9 @@ $(document).ready(function() {
               if (res) {
                 window.location.href = '/challenges/next-challenge';
               }
+            }).fail(
+            function() {
+              window.location.href="/challenges";
             }
           );
           break;