diff --git a/common/lib/capa/capa/templates/rubricinput.html b/common/lib/capa/capa/templates/rubricinput.html
index 1780603d91..051b9fe0e0 100644
--- a/common/lib/capa/capa/templates/rubricinput.html
+++ b/common/lib/capa/capa/templates/rubricinput.html
@@ -2,7 +2,7 @@
     <h3>Rubric</h3>
     % if view_only:
     <p>Select the criteria you feel best represents this submission in each category.</p>
-    % else
+    % else:
     <p>The highlighted selection best matches how the student feels you performed in each category.</p>
     % endif
     <table class="rubric">
diff --git a/lms/djangoapps/open_ended_grading/staff_grading_service.py b/lms/djangoapps/open_ended_grading/staff_grading_service.py
index 3591ff8bed..9727336791 100644
--- a/lms/djangoapps/open_ended_grading/staff_grading_service.py
+++ b/lms/djangoapps/open_ended_grading/staff_grading_service.py
@@ -133,7 +133,8 @@ class StaffGradingService(GradingService):
                 'feedback': feedback,
                 'grader_id': grader_id,
                 'skipped': skipped,
-                'rubric_scores': rubric_scores}
+                'rubric_scores': rubric_scores,
+                'rubric_scores_complete': True}
 
         return self.post(self.save_grade_url, data=data)
 
@@ -298,7 +299,7 @@ def save_grade(request, course_id):
     if request.method != 'POST':
         raise Http404
 
-    required = set(['score', 'feedback', 'submission_id', 'location', 'rubric_scores'])
+    required = set(['score', 'feedback', 'submission_id', 'location', 'rubric_scores[]'])
     actual = set(request.POST.keys())
     missing = required - actual
     if len(missing) > 0:
@@ -311,6 +312,7 @@ def save_grade(request, course_id):
 
     location = p['location']
     skipped =  'skipped' in p
+
     try:
         result_json = staff_grading_service().save_grade(course_id,
                                           grader_id,
@@ -318,7 +320,7 @@ def save_grade(request, course_id):
                                           p['score'],
                                           p['feedback'],
                                           skipped,
-                                          p['rubric_scores'])
+                                          p.getlist('rubric_scores[]'))
     except GradingServiceError:
         log.exception("Error saving grade")
         return _err_response('Could not connect to grading service')
diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee
index fa405eac88..d8fcb087a6 100644
--- a/lms/static/coffee/src/staff_grading/staff_grading.coffee
+++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee
@@ -286,6 +286,7 @@ class StaffGrading
   submit_and_get_next: () ->
     data =
       rubric_scores: @get_score_list()
+      score: 0
       feedback: @feedback_area.val()
       submission_id: @submission_id
       location: @location