diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html
index ee338cecbb..484bb94182 100644
--- a/lms/templates/peer_grading/peer_grading.html
+++ b/lms/templates/peer_grading/peer_grading.html
@@ -29,7 +29,7 @@
                 <ul class="problem-list">
                 %for problem in problem_list:
                     <li>
-                    <a href="${ajax_url}/problem/${problem.location}">${problem.problem_name} (${problem.num_graded} graded, ${problem.num_pending} pending)</a>
+                    <a href="${ajax_url}problem?location=${problem['location']}">${problem['problem_name']} (${problem['num_graded']} graded, ${problem['num_pending']} pending)</a>
                     </li>
                 %endfor
                 </ul>
diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html
index 9e6e44e699..116da94ece 100644
--- a/lms/templates/peer_grading/peer_grading_problem.html
+++ b/lms/templates/peer_grading/peer_grading_problem.html
@@ -17,7 +17,7 @@
 
 
 <section class="container">
-    <div class="peer-grading" data-ajax_url="${ajax_url}" location="${problem_location}">
+    <div class="peer-grading" data-ajax_url="${ajax_url}" data-location="${problem_location}">
         <div class="error-container"></div>
         <div class="message-container"></div>
 
@@ -53,6 +53,8 @@
             <h3></h3>
             <div class="submission-container">
             </div>
+            <input type="hidden" name="submission-key" value="" />
+            <input type="hidden" name="essay-id" value="" />
         </div>
         <div class="evaluation">
           <p class="score-selection-container">