diff --git a/src/www/diag_resetstate.php b/src/www/diag_resetstate.php
index 598e06340..a827e34f7 100644
--- a/src/www/diag_resetstate.php
+++ b/src/www/diag_resetstate.php
@@ -61,7 +61,7 @@ include("head.inc");
           <div class="container-fluid tab-content">
             <div class="tab-pane active" id="system">
               <?php if (isset($savemsg)) print_info_box($savemsg); ?>
-              <form action="<?=$_SERVER['REQUEST_URI'];?>" method="post">
+              <form method="post">
                 <br/>
                 <input name="statetable" type="checkbox" id="statetable" value="yes" checked="checked" />
                 <?= gettext("Firewall state table"); ?><br/><br/>
diff --git a/src/www/diag_system_pftop.php b/src/www/diag_system_pftop.php
index ec2fa736d..c4d84b49f 100644
--- a/src/www/diag_system_pftop.php
+++ b/src/www/diag_system_pftop.php
@@ -102,7 +102,7 @@ $( document ).ready(function() {
   <div class="container-fluid">
     <div class="row">
       <div class="table-responsive">
-        <form method="post" action="<?=$_SERVER['REQUEST_URI'];?>">
+        <form method="post">
           <table class="table table-striped">
             <thead>
               <tr>
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index 9e9e6015e..f30918442 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -181,7 +181,7 @@ if($need_alert_display == true) {
         <ul class="list-inline">
           <li><h1><?= gentitle($menuBreadcrumbs) ?></h1></li>
           <li class="btn-group-container">
-            <form action="<?=$_SERVER['REQUEST_URI'];?>" method="post">
+            <form method="post">
               <?php
               if (isset($service_hook)) {
                 $ssvc = service_by_name($service_hook);
diff --git a/src/www/vpn_ipsec_mobile.php b/src/www/vpn_ipsec_mobile.php
index fe7febbfd..10e6067b7 100644
--- a/src/www/vpn_ipsec_mobile.php
+++ b/src/www/vpn_ipsec_mobile.php
@@ -306,7 +306,7 @@ foreach ($config['ipsec']['phase1'] as $ph1ent) {
 
 function print_legacy_box($msg, $name, $value)
 {
-  $savebutton = "<form action=\"".$_SERVER['REQUEST_URI']."\" method=\"post\">";
+  $savebutton = "<form method=\"post\">";
   $savebutton .= "<input name=\"{$name}\" type=\"submit\" class=\"btn btn-default\" id=\"{$name}\" value=\"{$value}\" />";
   if (!empty($_POST['if'])) {
     $savebutton .= "<input type=\"hidden\" name=\"if\" value=\"" . htmlspecialchars($_POST['if']) . "\" />";