diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep
index b8c129d93f..c74428452b 100644
--- a/templates/ContentGenerator/GatewayQuiz.html.ep
+++ b/templates/ContentGenerator/GatewayQuiz.html.ep
@@ -575,6 +575,23 @@
 						</p>
 					% }
 					%
+					% if (
+						% (
+							% $authz->hasPermissions($userID, 'show_correct_answers_before_answer_date')
+							% || $authz->hasPermissions($userID, 'view_hidden_work')
+						% )
+						% && !$c->can_showCorrectAnswersForAll($c->{set}, $c->{problem}, $c->{tmplSet})
+						% )
+					% {
+						<p>
+							<b><%= maketext('Note') %>:</b>
+							<i>
+								<%= maketext('The correct answers shown in feedback are instructor previews and '
+									. 'will only be shown to students when answers are available.') =%>
+							</i>
+						</p>
+					% }
+					%
 					<div class="text-end mb-2">
 						<%= link_to maketext('preview answers') => '#',
 							class => 'gateway-preview-btn btn btn-secondary',
diff --git a/templates/ContentGenerator/Problem/messages.html.ep b/templates/ContentGenerator/Problem/messages.html.ep
index 561e3cd3ca..e122ee4022 100644
--- a/templates/ContentGenerator/Problem/messages.html.ep
+++ b/templates/ContentGenerator/Problem/messages.html.ep
@@ -43,8 +43,18 @@
 		<b><%= maketext('Note') %>:</b>
 		<i>
 			<%= maketext('The solution shown is an instructor preview and '
-				. 'will only be shown to students after the due date.'
+				. 'will only be shown to students after the answer date.'
 			) =%>
 		</i>
 	</p>
 % }
+%
+% if ($authz->hasPermissions($c->{userID}, 'show_correct_answers_before_answer_date')) {
+	<p>
+		<b><%= maketext('Note') %>:</b>
+		<i>
+			<%= maketext('The correct answers shown in feedback are instructor previews and '
+				. 'will only be shown to students after the answer date.') =%>
+		</i>
+	</p>
+% }
diff --git a/templates/ContentGenerator/ShowMeAnother/messages.html.ep b/templates/ContentGenerator/ShowMeAnother/messages.html.ep
index 666421e59f..dbdb7f244c 100644
--- a/templates/ContentGenerator/ShowMeAnother/messages.html.ep
+++ b/templates/ContentGenerator/ShowMeAnother/messages.html.ep
@@ -5,8 +5,8 @@
 % }
 %
 % if ($c->{pg}{flags}{hintExists}
-	% && $authz->hasPermissions($c->{userName}, 'always_show_hint')
-	% && !$c->{options}{showHints}) {
+	% && $authz->hasPermissions($c->{userID}, 'always_show_hint')
+	% && !$c->{showMeAnother}{options}{showHints}) {
 	% my $showHintsAfter =
 		% $c->{set}->hide_hint                 ? -1
 		% : $c->{problem}->showHintsAfter > -2 ? $c->{problem}->showHintsAfter
@@ -25,14 +25,25 @@
 % }
 %
 % if ($c->{pg}{flags}{solutionExists}
-	% && $authz->hasPermissions($c->{userName}, 'always_show_solution')
-	% && !$c->{options}{showSolutions}) {
+	% && $authz->hasPermissions($c->{userID}, 'always_show_solution')
+	% && !$c->{showMeAnother}{options}{showSolutions}) {
 	<p>
 		<b><%= maketext('Note') %>:</b>
 		<i>
 			<%= maketext('The solution shown is an instructor preview and '
-				. 'will only be shown to students after the due date.'
+				. 'will only be shown to students after the answer date.'
 			) =%>
 		</i>
 	</p>
 % }
+%
+% if ($authz->hasPermissions($c->{userID}, 'show_correct_answers_before_answer_date')
+	% && !$c->{showMeAnother}{options}{showCorrect}) {
+	<p>
+		<b><%= maketext('Note') %>:</b>
+		<i>
+			<%= maketext('The correct answers shown in feedback are instructor previews and '
+				. 'will only be shown to students after the answer date.') =%>
+		</i>
+	</p>
+% }