diff --git a/htdocs/js/ProblemGrader/problemgrader.js b/htdocs/js/ProblemGrader/problemgrader.js
index 1e33408bbf..941d77f5b4 100644
--- a/htdocs/js/ProblemGrader/problemgrader.js
+++ b/htdocs/js/ProblemGrader/problemgrader.js
@@ -15,7 +15,8 @@
 			problemSeed: selectedUser.dataset.problemSeed,
 			set_id: document.getElementsByName('hidden_set_id')[0]?.value,
 			probNum: document.getElementsByName('hidden_problem_id')[0]?.value,
-			processAnswers: 1
+			processAnswers: 1,
+			WWcorrectAns: 1
 		};
 
 		if (selectedUser.dataset.versionId) ro.version_id = selectedUser.dataset.versionId;
diff --git a/templates/ContentGenerator/Instructor/ProblemGrader.html.ep b/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
index d6e4c804ab..3a4a91aecf 100644
--- a/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
@@ -77,7 +77,7 @@
 								ref($_->{problem}) =~ /::ProblemVersion/
 									? (
 										version_id    => $_->{problem}->version_id,
-										answer_prefix => sprintf('Q%04d_', $_->{problemNumber} + 1)
+										answer_prefix => sprintf('Q%04d_', $_->{problem}->problem_id)
 									)
 									: (),
 							}
diff --git a/templates/RPCRenderFormats/default.html.ep b/templates/RPCRenderFormats/default.html.ep
index eab3588192..c2bb978b04 100644
--- a/templates/RPCRenderFormats/default.html.ep
+++ b/templates/RPCRenderFormats/default.html.ep
@@ -102,6 +102,9 @@
 					%= hidden_field showFooter                   => $showFooter
 					%= hidden_field extra_header_text            => $extra_header_text
 					%= hidden_field problem_data                 => $problem_data
+					% if ($ws->{inputs_ref}{answerPrefix}) {
+						%= hidden_field answerPrefix => $ws->{inputs_ref}{answerPrefix}
+					% }
 					% if ($formatName eq 'debug' && $ws->{inputs_ref}{clientDebug}) {
 						%= hidden_field clientDebug => $ws->{inputs_ref}{clientDebug}
 					% }