diff --git a/templates/adblock.php b/templates/adblock.php
index b51d6dd8..19f9c544 100755
--- a/templates/adblock.php
+++ b/templates/adblock.php
@@ -28,7 +28,7 @@
         <div class="card-body">
         <?php $status->showMessages(); ?>
           <form role="form" action="adblock_conf" enctype="multipart/form-data" method="POST">
-            <?php echo CSRFTokenFieldTag() ?>
+            <?php echo $token->CSRFTokenFieldTag(); ?>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
                 <li class="nav-item"><a class="nav-link active" id="blocklisttab" href="#adblocklistsettings" data-bs-toggle="tab"><?php echo _("Blocklist settings"); ?></a></li>
diff --git a/templates/admin.php b/templates/admin.php
index c528e781..90d98988 100755
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -19,7 +19,7 @@
         <?php $status->showMessages(); ?>
         <h4><?php echo _("Authentication settings") ;?></h4>
         <form role="form" action="auth_conf" method="POST" class="needs-validation" novalidate>
-            <?php echo CSRFTokenFieldTag() ?>
+            <?php echo $token->CSRFTokenFieldTag() ?>
           <div class="row">
             <div class="mb-3 col-md-6">
               <label for="username"><?php echo _("Username"); ?></label>
diff --git a/templates/configure_client.php b/templates/configure_client.php
index bc1b39f1..d4649918 100755
--- a/templates/configure_client.php
+++ b/templates/configure_client.php
@@ -27,7 +27,7 @@
         <div class="row" id="wpaConf">
           <div class="col">
             <form method="POST" action="wpa_conf" name="wpa_conf_form">
-              <?php echo CSRFTokenFieldTag() ?>
+              <?php echo $token->CSRFTokenFieldTag() ?>
               <input type="hidden" name="client_settings" ?>
               <div class="js-wifi-stations loading-spinner"></div>
             </form>
diff --git a/templates/dashboard.php b/templates/dashboard.php
index 394dcbf6..2b9a7ed6 100755
--- a/templates/dashboard.php
+++ b/templates/dashboard.php
@@ -30,7 +30,7 @@
       <div class="card-body">
         <?php $status->showMessages(); ?>
         <form action="wlan0_info" method="POST">
-          <?php echo CSRFTokenFieldTag() ?>
+          <?php echo $token->CSRFTokenFieldTag() ?>
 
           <!-- Nav tabs -->
           <ul class="nav nav-tabs">
diff --git a/templates/dhcp.php b/templates/dhcp.php
index 40989763..1ba6d3b9 100755
--- a/templates/dhcp.php
+++ b/templates/dhcp.php
@@ -30,7 +30,7 @@
       <div class="card-body">
         <?php $status->showMessages(); ?>
         <form method="POST" action="dhcpd_conf" class="js-dhcp-settings-form needs-validation" novalidate>
-          <?php echo CSRFTokenFieldTag() ?>
+          <?php echo $token->CSRFTokenFieldTag() ?>
 
           <!-- Nav tabs -->
           <ul class="nav nav-tabs mb-3">
diff --git a/templates/hostapd.php b/templates/hostapd.php
index e4eaee58..b802b208 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -50,7 +50,7 @@
       <div class="card-body">
         <?php $status->showMessages(); ?>
         <form role="form" action="hostapd_conf" method="POST" class="needs-validation" novalidate>
-          <?php echo CSRFTokenFieldTag() ?>
+          <?php echo $token->CSRFTokenFieldTag() ?>
 
           <!-- Nav tabs -->
           <ul class="nav nav-tabs">
diff --git a/templates/login.php b/templates/login.php
index ab8cfbd0..3291364d 100755
--- a/templates/login.php
+++ b/templates/login.php
@@ -15,7 +15,7 @@
             </div>
             <div class="text-center mb-4">
               <form id="admin-login-form" action="login" method="POST" class="needs-validation" novalidate>
-              <?php echo CSRFTokenFieldTag() ?>
+              <?php echo $token->CSRFTokenFieldTag() ?>
                 <div class="form-group">
                   <input type="hidden" name="login-auth">
                   <input type="hidden" id="redirect-url" name="redirect-url" value="<?php echo htmlspecialchars($redirectUrl, ENT_QUOTES, 'UTF-8'); ?>">
diff --git a/templates/openvpn.php b/templates/openvpn.php
index f2b839e8..2d923b54 100755
--- a/templates/openvpn.php
+++ b/templates/openvpn.php
@@ -29,7 +29,7 @@
         <div class="card-body">
         <?php $status->showMessages(); ?>
           <form role="form" action="openvpn_conf" enctype="multipart/form-data" method="POST">
-            <?php echo CSRFTokenFieldTag() ?>
+            <?php echo $token->CSRFTokenFieldTag() ?>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
                 <li class="nav-item"><a class="nav-link active" id="clienttab" href="#openvpnclient" data-bs-toggle="tab"><?php echo _("Client settings"); ?></a></li>
diff --git a/templates/restapi.php b/templates/restapi.php
index 48e918d8..3a26ae20 100755
--- a/templates/restapi.php
+++ b/templates/restapi.php
@@ -28,7 +28,7 @@
         <div class="card-body">
         <?php $status->showMessages(); ?>
           <form role="form" action="restapi_conf" method="POST" class="needs-validation" novalidate>
-            <?php echo CSRFTokenFieldTag() ?>
+            <?php echo $token->CSRFTokenFieldTag() ?>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
                 <li class="nav-item"><a class="nav-link active" id="restapisettingstab" href="#restapisettings" data-bs-toggle="tab"><?php echo _("Settings"); ?></a></li>
diff --git a/templates/system.php b/templates/system.php
index 039614c4..64b25e82 100755
--- a/templates/system.php
+++ b/templates/system.php
@@ -11,7 +11,7 @@
       <div class="card-body">
         <?php $status->showMessages(); ?>
         <form role="form" action="system_info" method="POST">
-        <?php echo CSRFTokenFieldTag() ?>
+        <?php echo $token->CSRFTokenFieldTag() ?>
         <ul class="nav nav-tabs" role="tablist">
           <li role="presentation" class="nav-item"><a class="nav-link active" id="basictab" href="#basic" aria-controls="basic" role="tab" data-bs-toggle="tab"><?php echo _("Basic"); ?></a></li>
           <li role="presentation" class="nav-item"><a class="nav-link" id="languagetab" href="#language" aria-controls="language" role="tab" data-bs-toggle="tab"><?php echo _("Language"); ?></a></li>
diff --git a/templates/system/advanced.php b/templates/system/advanced.php
index 0f110932..8b48e988 100644
--- a/templates/system/advanced.php
+++ b/templates/system/advanced.php
@@ -3,7 +3,7 @@
   <h4 class="mt-3"><?php echo _("Advanced settings") ;?></h4>
     <?php if (!RASPI_MONITOR_ENABLED) : ?>
     <form action="system_info" method="POST">
-    <?php echo CSRFTokenFieldTag() ?>
+    <?php echo $token->CSRFTokenFieldTag() ?>
       <div class="row">
         <div class="mb-3 col-md-6">
           <label for="code"><?php echo _("Web server port") ;?></label>
diff --git a/templates/system/basic.php b/templates/system/basic.php
index 4474e3d9..353743dd 100644
--- a/templates/system/basic.php
+++ b/templates/system/basic.php
@@ -56,7 +56,7 @@ include('includes/sysstats.php');
       </div>
 
       <form action="system_info" method="POST">
-        <?php echo CSRFTokenFieldTag() ?>
+        <?php echo $token->CSRFTokenFieldTag() ?>
         <?php if (!RASPI_MONITOR_ENABLED) : ?>
             <input type="button" class="btn btn-warning" data-bs-toggle="modal" data-bs-target="#system-confirm-reboot" value="<?php echo _("Reboot"); ?>" />
             <input type="button" class="btn btn-warning" data-bs-toggle="modal" data-bs-target="#system-confirm-shutdown" value="<?php echo _("Shutdown"); ?>" />
diff --git a/templates/system/plugins.php b/templates/system/plugins.php
index 4d875c49..1365a976 100644
--- a/templates/system/plugins.php
+++ b/templates/system/plugins.php
@@ -1,7 +1,7 @@
 <!-- plugins tab -->
 <div role="tabpanel" class="tab-pane" id="plugins">
   <h4 class="mt-3"><?php echo _("Plugins") ;?></h4>
-  <?php echo CSRFTokenFieldTag() ?>
+  <?php echo $token->CSRFTokenFieldTag() ?>
   <div class="row">
     <div class="form-group col-lg-8 col-md-8">
     <label>
diff --git a/templates/system/theme.php b/templates/system/theme.php
index 83caeae6..592f2d47 100644
--- a/templates/system/theme.php
+++ b/templates/system/theme.php
@@ -12,7 +12,7 @@
     </div>
     </div>
     <form action="system_info" method="POST">
-    <?php echo CSRFTokenFieldTag() ?>
+    <?php echo $token->CSRFTokenFieldTag() ?>
     <button type="button" onClick="window.location.reload();" class="btn btn-outline btn-primary"><i class="fas fa-sync-alt"></i> <?php echo _("Refresh") ?></a>
     </form>
 </div>
diff --git a/templates/system/tools.php b/templates/system/tools.php
index 32eb19ca..b38b2ced 100644
--- a/templates/system/tools.php
+++ b/templates/system/tools.php
@@ -2,7 +2,7 @@
 <div role="tabpanel" class="tab-pane" id="tools">
   <h4 class="mt-3"><?php echo _("System tools") ;?></h4>
     <?php if (!RASPI_MONITOR_ENABLED) : ?>
-    <?php echo CSRFTokenFieldTag() ?>
+    <?php echo $token->CSRFTokenFieldTag() ?>
 
       <div class="row">
         <div class="mb-3 col-lg-8 col-md-8">
diff --git a/templates/wireguard.php b/templates/wireguard.php
index 83669f7d..40bb1970 100755
--- a/templates/wireguard.php
+++ b/templates/wireguard.php
@@ -28,7 +28,7 @@
         <div class="card-body">
         <?php $status->showMessages(); ?>
           <form role="form" action="wg_conf" enctype="multipart/form-data" method="POST">
-            <?php echo CSRFTokenFieldTag() ?>
+            <?php echo $token->CSRFTokenFieldTag() ?>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
                 <li class="nav-item"><a class="nav-link active" id="settingstab" href="#wgsettings" data-bs-toggle="tab"><?php echo _("Settings"); ?></a></li>