diff --git a/includes/hostapd.php b/includes/hostapd.php
index 0a425cb5..e7facc94 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -69,6 +69,7 @@ function DisplayHostAPDConfig()
         <div class="panel-body">
       <p><?php $status->showMessages(); ?></p>
           <form role="form" action="?page=hostapd_conf" method="POST">
+            <?php echo CSRFTokenFieldTag() ?>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
               <li class="active"><a href="#basic" data-toggle="tab"><?php echo _("Basic"); ?></a></li>
@@ -82,7 +83,6 @@ function DisplayHostAPDConfig()
                 <div class="tab-pane fade in active" id="basic">
 
                 <h4><?php echo _("Basic settings") ;?></h4>
-                <?php echo CSRFTokenFieldTag() ?>
                 <div class="row">
                   <div class="form-group col-md-4">
                     <label for="cbxinterface"><?php echo _("Interface") ;?></label>
diff --git a/includes/system.php b/includes/system.php
index 0b7c23b0..ed849237 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -155,6 +155,7 @@ function DisplaySystem()
 
   <p><?php $status->showMessages(); ?></p>
   <form role="form" action="?page=system_info" method="POST">
+  <?php echo CSRFTokenFieldTag() ?>
   <ul class="nav nav-tabs" role="tablist">
     <li role="presentation" class="active systemtab"><a href="#system" aria-controls="system" role="tab" data-toggle="tab"><?php echo _("System"); ?></a></li>
     <li role="presentation" class="languagetab"><a href="#language" aria-controls="language" role="tab" data-toggle="tab"><?php echo _("Language"); ?></a></li>
@@ -198,7 +199,6 @@ function DisplaySystem()
 
     <div role="tabpanel" class="tab-pane" id="language">
       <h4><?php echo _("Language settings") ;?></h4>
-        <?php echo CSRFTokenFieldTag() ?>
       <div class="row">
         <div class="form-group col-md-4">
           <label for="code"><?php echo _("Select a language"); ?></label>