diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 54d277ed39..af7bb86be5 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -102,7 +102,7 @@
 				<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 				<p class="submit-buttons">
 					<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-					<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+					<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
 				</p>
 				{S_FORM_TOKEN}
 			</fieldset>
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index e59e06e1cd..3b6febd566 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -53,7 +53,7 @@ class acp_search
 		global $user, $template, $phpbb_log, $request;
 		global $config, $phpbb_admin_path, $phpEx;
 
-		$submit = (isset($_POST['submit'])) ? true : false;
+		$submit = $request->is_set_post('submit');
 
 		if ($submit && !check_link_hash($request->variable('hash', ''), 'acp_search'))
 		{
@@ -245,13 +245,13 @@ class acp_search
 		$action = $request->variable('action', '');
 		$this->state = explode(',', $config['search_indexing_state']);
 
-		if (isset($_POST['cancel']))
+		if ($request->is_set_post('cancel'))
 		{
 			$action = '';
 			$this->state = array();
 			$this->save_state();
 		}
-		$submit = $request->is_set_post('submit', false);
+		$submit = $request->is_set_post('submit');
 
 		if (!check_link_hash($request->variable('hash', ''), 'acp_search') && in_array($action, array('create', 'delete')))
 		{