diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 2d41314170..6fe214a56a 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -637,7 +637,7 @@ def change_enrollment(request):
 
         current_mode = available_modes[0]
         # only automatically enroll people if the only mode is 'honor'
-        if current_mode.slug != 'honor':
+        if current_mode.slug == 'verified':
             return HttpResponse(
                 reverse("course_modes_choose", kwargs={'course_id': unicode(course_id)})
             )
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 839da9cdb7..7019163cc3 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -75,7 +75,7 @@ class VerifyView(View):
             progress_state = "start"
 
         modes_dict = CourseMode.modes_for_course_dict(course_id)
-        verify_mode = modes_dict['verified']
+        verify_mode = modes_dict.get('verified', None)
         # if the course doesn't have a verified mode, we want to kick them
         # from the flow
         if not verify_mode:
@@ -125,7 +125,7 @@ class VerifiedView(View):
             return redirect(reverse('dashboard'))
 
         modes_dict = CourseMode.modes_for_course_dict(course_id)
-        verify_mode = modes_dict['verified']
+        verify_mode = modes_dict.get('verified', None)
 
         if verify_mode is None:
             return redirect(reverse('dashboard'))