diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py
index f00bd62d93..e4b115fe22 100644
--- a/common/djangoapps/course_modes/views.py
+++ b/common/djangoapps/course_modes/views.py
@@ -49,6 +49,8 @@ class ChooseModeView(View):
             return self.get(request, error=error_msg)
 
         requested_mode = self.get_requested_mode(request.POST.get("mode"))
+        if requested_mode == "verified" and request.POST.get("honor-code"):
+            requested_mode = "honor"
 
         allowed_modes = CourseMode.modes_for_course_dict(course_id)
         if requested_mode not in allowed_modes:
diff --git a/common/templates/course_modes/choose.html b/common/templates/course_modes/choose.html
index d8d8592793..d9b7724f51 100644
--- a/common/templates/course_modes/choose.html
+++ b/common/templates/course_modes/choose.html
@@ -73,11 +73,11 @@
               <dt>I'd like to pay more than the minimum.  Is my contribution tax deductible?</dt>
               <dd>Please check with your tax advisor to determine whether your contribution is tax deductible.</dd>
 
-
               % if "honor" in modes:
               <dt>What if I can't afford it?</dt>
               <dd>If you cannot afford the minimum payment, you can always work towards a free  Honor Code Certificate of Achievement for this course.
 
+              <!--
                 Enter $0 above and explain why you would like the fee waived below. Then click Select Certificate button to move on to the next step.
                 <dl>
                   <dt><label class="sr" for="explain">Explain your situation:</label></dt>
@@ -86,13 +86,14 @@
 
                   </dd>
                 </dl>
+                -->
                 </dd>
               % endif
 
               % if "honor" in modes:
               <dt>What if I don't meet all of the requirements for financial assistance but I   still want to work toward a certificate?</dt>
                 <dd>If you don't have a webcam, credit or debit card or acceptable ID, you can  opt to simply audit this course, or select to work towards a free Honor Code Certificate of Achievement for this course by checking the box below. Then  click the Select Certificate button to complete registration. We won't ask you to verify your identity.
-                  <p><input type="checkbox" name="honor-code"> <label for="honor-code">Select Honor Code Certificate</label></p>
+                  <p><input type="checkbox" name="honor-code" id="honor-code"> <label for="honor-code">Select Honor Code Certificate</label></p>
                 </dd>
               % endif
             </dl>