diff --git a/front/deviceDetails.php b/front/deviceDetails.php
index 47cf35fe..d5fc5a79 100644
--- a/front/deviceDetails.php
+++ b/front/deviceDetails.php
@@ -401,7 +401,7 @@
                         <button type="button" class="btn btn-default pa-btn" style="margin-left:6px;" 
                           id="btnRestore"  onclick="getDeviceData(true)"> Reset Changes </button>
                         <button type="button" disabled class="btn btn-primary pa-btn" style="margin-left:6px; " 
-                          id="btnSave"     onclick="setDeviceData()" >     Save </button>
+                          id="btnSave"     onclick="setDeviceData()" >     Save </button>                          
                     </div>
                   </div>
 
diff --git a/front/maintenance.php b/front/maintenance.php
new file mode 100644
index 00000000..de350f84
--- /dev/null
+++ b/front/maintenance.php
@@ -0,0 +1,70 @@
+<?php
+//------------------------------------------------------------------------------
+//  Pi.Alert
+//  Open Source Network Guard / WIFI & LAN intrusion detector 
+//
+//  devices.php - Front module. Server side. Manage Devices
+//------------------------------------------------------------------------------
+//  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+//  jokob-sk 2022        jokob.sk@gmail.com        GNU GPLv3
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+?>
+
+<?php
+  require 'php/templates/header.php';
+?>
+<!-- Page ------------------------------------------------------------------ -->
+<div class="content-wrapper">
+
+<!-- Content header--------------------------------------------------------- -->
+    <section class="content-header">
+      <h1 id="pageTitle">
+         Maintenance tools
+      </h1>
+    </section>
+
+    <!-- Main content ---------------------------------------------------------- -->
+    <section class="content">
+
+
+    <div class="col-xs-12">
+      <div class="pull-right">
+          <button type="button" class="btn btn-default pa-btn pa-btn-delete"  style="margin-left:0px;"
+            id="btnDelete"   onclick="askDeleteDevicesWithEmptyMACs()">   Delete Devices with empty MACs </button>     
+      </div>
+    </div>
+
+    <!-- ----------------------------------------------------------------------- -->
+    </section>
+    <!-- /.content -->
+  </div>
+  <!-- /.content-wrapper -->
+
+
+<!-- ----------------------------------------------------------------------- -->
+<?php
+  require 'php/templates/footer.php';
+?>
+
+
+<script>
+  function askDeleteDevicesWithEmptyMACs () {
+  // Ask delete device
+  showModalWarning ('Delete Devices', 'Are you sure you want to delete all devices with empty MAC addresses?<br>(maybe you prefer to archive it)',
+    'Cancel', 'Delete', 'deleteDevicesWithEmptyMACs');
+}
+
+
+function deleteDevicesWithEmptyMACs()
+{ 
+  // Delete device
+  $.get('php/server/devices.php?action=deleteAllWithEmptyMACs', function(msg) {
+    showMessage (msg);
+  });
+}
+</script>
+
+
diff --git a/front/php/server/devices.php b/front/php/server/devices.php
index e2b6c531..08a7f8f7 100644
--- a/front/php/server/devices.php
+++ b/front/php/server/devices.php
@@ -31,6 +31,8 @@
       case 'getDeviceData':           getDeviceData();                         break;
       case 'setDeviceData':           setDeviceData();                         break;
       case 'deleteDevice':            deleteDevice();                          break;
+      case 'deleteAllWithEmptyMACs':  deleteAllWithEmptyMACs();                break;
+      
  
       case 'getDevicesTotals':        getDevicesTotals();                      break;
       case 'getDevicesList':          getDevicesList();                        break;
@@ -173,6 +175,26 @@ function deleteDevice() {
   }
 }
 
+//------------------------------------------------------------------------------
+//  Delete all devices with empty MAC addresses
+//------------------------------------------------------------------------------
+function deleteAllWithEmptyMACs() {
+  global $db;
+
+  // sql
+  $sql = 'DELETE FROM Devices WHERE dev_MAC=""';
+  // execute sql
+  $result = $db->query($sql);
+
+  // check result
+  if ($result == TRUE) {
+    echo "Devices deleted successfully";
+  } else {
+    echo "Error deleting devices\n\n$sql \n\n". $db->lastErrorMsg();
+  }
+}
+
+
 
 //------------------------------------------------------------------------------
 //  Query total numbers of Devices by status
diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index 6b9de904..eae9305a 100644
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -169,6 +169,10 @@
           <a href="events.php"><i class="fa fa-bolt"></i> <span>Events</span></a>
         </li>
 
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
+          <a href="maintenance.php"><i class="fa fa-bolt"></i> <span>Maintenance</span></a>
+        </li>
+
 <!--
         <li class="treeview">
           <a href="#"><i class="fa fa-link"></i> <span>Config</span>