diff --git a/src/usr/local/www/status_captiveportal_expire.php b/src/usr/local/www/status_captiveportal_expire.php
index 3030d1e014..9515a63596 100644
--- a/src/usr/local/www/status_captiveportal_expire.php
+++ b/src/usr/local/www/status_captiveportal_expire.php
@@ -57,13 +57,11 @@ $pglinks = array("", "status_captiveportal.php", "status_captiveportal.php?zone=
 
 include("head.inc");
 
-if ($_POST['save']) {
-	if ($_POST['vouchers']) {
-		if (voucher_expire($_POST['vouchers'])) {
-			print_info_box(gettext('Voucher(s) successfully marked.'), 'success', false);
-		} else {
-			print_info_box(gettext('Voucher(s) could not be processed.'), 'danger', false);
-		}
+if ($_POST['Submit'] && $_POST['vouchers']) {
+	if (voucher_expire(trim($_POST['vouchers']))) {
+		print_info_box(gettext('Voucher(s) successfully marked.'), 'success', false);
+	} else {
+		print_info_box(gettext('Voucher(s) could not be processed.'), 'danger', false);
 	}
 }
 
diff --git a/src/usr/local/www/status_captiveportal_test.php b/src/usr/local/www/status_captiveportal_test.php
index 71a56256ad..6075256861 100644
--- a/src/usr/local/www/status_captiveportal_test.php
+++ b/src/usr/local/www/status_captiveportal_test.php
@@ -58,21 +58,19 @@ $shortcut_section = "captiveportal-vouchers";
 
 include("head.inc");
 
-if ($_POST['save']) {
-	if ($_POST['vouchers']) {
-		$test_results = voucher_auth($_POST['vouchers'], 1);
-		$output = "";
-		$class = 'warning';
+if ($_POST['Submit'] && $_POST['vouchers']) {
+	$test_results = voucher_auth(trim($_POST['vouchers']), 1);
+	$output = "";
+	$class = 'warning';
 
-		foreach ($test_results as $result) {
-			$output .= htmlspecialchars($result) . '<br />';
+	foreach ($test_results as $result) {
+		$output .= htmlspecialchars($result) . '<br />';
 
-			if (strpos($result, " good ") || strpos($result, " granted ")) {
-				$class = 'success';
-			}
+		if (strpos($result, " good ") || strpos($result, " granted ")) {
+			$class = 'success';
 		}
-		print_info_box($output, $class, false);
 	}
+	print_info_box($output, $class, false);
 }
 
 $tab_array = array();