diff --git a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
index 91381e332f..22f0060230 100644
--- a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
+++ b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
@@ -600,20 +600,19 @@ async sub pre_header_initialize ($c) {
 			{
 
 				$c->{invalidSet} = $c->maketext(
-					'User [_1] is being acted as.  If you continue, you will create a new version of '
+					'You are acting as user [_1].  If you continue, you will create a new version of '
 						. 'this set for that user, which will count against their allowed maximum '
-						. 'number of versions for the current time interval.  IN GENERAL, THIS IS NOT '
-						. 'WHAT YOU WANT TO DO.  Please be sure that you want to do this before clicking '
-						. 'the "Create New Test Version" button below.  Alternately, PRESS THE "BACK" BUTTON '
-						. 'and continue.',
+						. 'number of versions for the current time interval.  In general, this is not '
+						. 'what you want to do.  Please be sure that you want to do this before clicking '
+						. 'the "Create New Test Version" button below.  Alternately, click "Cancel".',
 					$effectiveUserID
 				);
 				$c->{invalidVersionCreation} = 1;
 
 			} elsif ($effectiveUserID ne $userID) {
 				$c->{invalidSet} = $c->maketext(
-					'User [_1] is being acted as. When acting as another user, '
-						. 'new versions of the test cannot be created.',
+					'You are acting as user [_1], and do not have the permission to create a new test version '
+						. 'when acting as another user.',
 					$effectiveUserID
 				);
 				$c->{invalidVersionCreation} = 2;
diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep
index 0bd506cf89..ce8719b0fb 100644
--- a/templates/ContentGenerator/GatewayQuiz.html.ep
+++ b/templates/ContentGenerator/GatewayQuiz.html.ep
@@ -90,6 +90,12 @@
 					),
 					class => 'btn btn-primary'
 				=%>
+				<%= link_to maketext('Cancel') => $c->systemLink(
+						url_for('problem_list', setID => $setID),
+						params => { effectiveUser => $effectiveUserID, user => $userID }
+					),
+					class => 'btn btn-primary'
+				=%>
 			</div>
 		% }
 	</div>