diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
index 8067f25d9..05619b47c 100755
--- a/html/cgi-bin/captive/index.cgi
+++ b/html/cgi-bin/captive/index.cgi
@@ -53,8 +53,8 @@ unless (-f $clients){ system("touch $clients"); }
 #Read settings
 &General::readhash("$settingsfile", \%settings) if(-f $settingsfile);
 
-#Actions
-if ($cgiparams{'ACTION'} eq "$Lang::tr{'gpl i accept these terms and conditions'}"){
+# Actions
+if ($cgiparams{'ACTION'} eq "SUBMIT") {
 	#Get Clients IP-Address
 	my $ip_address = $ENV{X_FORWARDED_FOR} || $ENV{REMOTE_ADDR} ||"";
 
@@ -82,7 +82,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'gpl i accept these terms and conditions'
 	}	
 }
 
-if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive activate'}"){
+if ($cgiparams{'ACTION'} eq "SUBMIT") {
 	my $ip_address;
 	my $mac_address;
 	my $granted=0;
diff --git a/html/html/captive/template.html b/html/html/captive/template.html
index 26f414208..369532a08 100644
--- a/html/html/captive/template.html
+++ b/html/html/captive/template.html
@@ -30,6 +30,7 @@
 							</TMPL_IF>
 
 							<form action="" method="POST">
+								<input type="hidden" name="ACTION" value="SUBMIT">
 								<input type="hidden" name="url" value="<TMPL_VAR NAME="URL">">
 
 								<TMPL_IF NAME="VOUCHER">