diff --git a/front/events.php b/front/events.php
index 6d81b97c..2fa28397 100755
--- a/front/events.php
+++ b/front/events.php
@@ -145,6 +145,9 @@
                   <th><?= lang('Events_TableHead_IP');?></th>
                   <th><?= lang('Events_TableHead_IPOrder');?></th>
                   <th><?= lang('Events_TableHead_AdditionalInfo');?></th>
+                  <th>N/A</th> 
+                  <th>MAC</th>
+                  <th><?= lang('Events_TableHead_PendingAlert');?></th>
                 </tr>
                 </thead>
               </table>
@@ -236,7 +239,7 @@ function initializeDatatable () {
     'pageLength'   : tableRows,
 
     'columnDefs'  : [
-      {visible:   false,         targets: [0,5,6,7,8,10] },
+      {visible:   false,         targets: [0,5,6,7,8,10,11,12,13] },
       {className: 'text-center', targets: [] },
       {orderData: [8],           targets: 7 },
       {orderData: [10],          targets: 9 },
@@ -251,6 +254,13 @@ function initializeDatatable () {
       {targets: [3,4,5,6,7],
         "createdCell": function (td, cellData, rowData, row, col) {
           $(td).html (translateHTMLcodes (cellData));
+      } },
+
+      // PendingAlert
+      {targets: [14],
+        "createdCell": function (td, cellData, rowData, row, col) {
+          // console.log(cellData);
+          $(td).html (cellData);
       } }
     ],
 
@@ -331,7 +341,7 @@ function getEvents (p_eventsType) {
   $('#tableEventsBox')[0].className = 'box box-' + color;
   $('#tableEventsTitle').html (tableTitle);
 
-  // Coluumns Visibility
+  // Columns Visibility
   $('#tableEvents').DataTable().column(3).visible (!sesionCols);
   $('#tableEvents').DataTable().column(4).visible (!sesionCols);
   $('#tableEvents').DataTable().column(5).visible (sesionCols);
diff --git a/front/js/db_methods.js b/front/js/db_methods.js
index 84268976..1300c2e9 100755
--- a/front/js/db_methods.js
+++ b/front/js/db_methods.js
@@ -36,7 +36,8 @@ function checkDbLock() {
             }
         },
         error: function() {
-            console.log('Error checking database lock status');
+            console.log('🟥 Error checking database lock status');
+            $(".header-status-locked-db").show()
         }
     });
 }
diff --git a/front/php/server/events.php b/front/php/server/events.php
index a1c73080..8ce23a28 100755
--- a/front/php/server/events.php
+++ b/front/php/server/events.php
@@ -105,7 +105,7 @@ function getEvents() {
   $periodDate = getDateFromPeriod();
 
   // SQL 
-  $SQL1 = 'SELECT eve_DateTime AS eve_DateTimeOrder, dev_name, dev_owner, eve_DateTime, eve_EventType, NULL, NULL, NULL, NULL, eve_IP, NULL, eve_AdditionalInfo, NULL, Dev_MAC
+  $SQL1 = 'SELECT eve_DateTime AS eve_DateTimeOrder, dev_name, dev_owner, eve_DateTime, eve_EventType, NULL, NULL, NULL, NULL, eve_IP, NULL, eve_AdditionalInfo, NULL, Dev_MAC, eve_PendingAlertEmail
            FROM Events_Devices 
            WHERE eve_DateTime >= '. $periodDate;
  
diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json
index 78d48405..c578d46e 100755
--- a/front/php/templates/language/de_de.json
+++ b/front/php/templates/language/de_de.json
@@ -266,6 +266,7 @@
     "Events_TableHead_IPOrder": "IP Order",
     "Events_TableHead_Order": "Order",
     "Events_TableHead_Owner": "Eigent\u00fcmer",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "Zeige _START_ bis _END_ von _TOTAL_ Eintr\u00e4gen",
     "Events_Table_nav_next": "N\u00e4chste",
     "Events_Table_nav_prev": "Zur\u00fcck",
diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index 1da7163b..5c6ab0c1 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -254,6 +254,7 @@
     "Events_TableHead_IPOrder": "IP Order",
     "Events_TableHead_Order": "Order",
     "Events_TableHead_Owner": "Owner",
+    "Events_TableHead_PendingAlert": "Pending Alert",
     "Events_Table_info": "Showing _START_ to _END_ of _TOTAL_ entries",
     "Events_Table_nav_next": "Next",
     "Events_Table_nav_prev": "Previous",
diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json
index 289d7816..263b5b31 100755
--- a/front/php/templates/language/es_es.json
+++ b/front/php/templates/language/es_es.json
@@ -264,6 +264,7 @@
     "Events_TableHead_IPOrder": "Orden de IP",
     "Events_TableHead_Order": "Ordenar",
     "Events_TableHead_Owner": "Propietario",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "Mostrando el INICIO y el FINAL de TODAS las entradas",
     "Events_Table_nav_next": "Siguiente",
     "Events_Table_nav_prev": "Anterior",
diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json
index 84b1234b..cf57cda6 100755
--- a/front/php/templates/language/fr_fr.json
+++ b/front/php/templates/language/fr_fr.json
@@ -254,6 +254,7 @@
     "Events_TableHead_IPOrder": "",
     "Events_TableHead_Order": "",
     "Events_TableHead_Owner": "Propri\u00e9taire",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "Affichage de _START_ \u00e0 _END_ sur _TOTAL_ entr\u00e9es",
     "Events_Table_nav_next": "Suivant",
     "Events_Table_nav_prev": "Pr\u00e9c\u00e9dent",
diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json
index 843ba222..345426bc 100755
--- a/front/php/templates/language/it_it.json
+++ b/front/php/templates/language/it_it.json
@@ -254,6 +254,7 @@
     "Events_TableHead_IPOrder": "Ordine IP",
     "Events_TableHead_Order": "Ordine",
     "Events_TableHead_Owner": "Proprietario",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "_START_ - _END_ di _TOTAL_ elementi",
     "Events_Table_nav_next": "Prossimo",
     "Events_Table_nav_prev": "Precedente",
diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json
index 220e8012..6fa79062 100755
--- a/front/php/templates/language/nb_no.json
+++ b/front/php/templates/language/nb_no.json
@@ -254,6 +254,7 @@
     "Events_TableHead_IPOrder": "",
     "Events_TableHead_Order": "",
     "Events_TableHead_Owner": "",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "",
     "Events_Table_nav_next": "",
     "Events_Table_nav_prev": "",
diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json
index 745dea30..1f5ddd98 100755
--- a/front/php/templates/language/pl_pl.json
+++ b/front/php/templates/language/pl_pl.json
@@ -254,6 +254,7 @@
     "Events_TableHead_IPOrder": "Kolejno\u015b\u0107 IP",
     "Events_TableHead_Order": "Kolejno\u015b\u0107",
     "Events_TableHead_Owner": "W\u0142a\u015bciciel",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "Poka\u017c_START_do_KONIEC_wszystkich_wpis\u00f3w",
     "Events_Table_nav_next": "Nast\u0119pna",
     "Events_Table_nav_prev": "Poprzednia",
diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json
index d4fb415f..e39176f8 100755
--- a/front/php/templates/language/pt_br.json
+++ b/front/php/templates/language/pt_br.json
@@ -254,6 +254,7 @@
     "Events_TableHead_IPOrder": "",
     "Events_TableHead_Order": "",
     "Events_TableHead_Owner": "",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "",
     "Events_Table_nav_next": "",
     "Events_Table_nav_prev": "",
diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json
index cf9091a1..6512f8bd 100755
--- a/front/php/templates/language/ru_ru.json
+++ b/front/php/templates/language/ru_ru.json
@@ -254,6 +254,7 @@
     "Events_TableHead_IPOrder": "IP-\u0437\u0430\u043f\u0440\u043e\u0441",
     "Events_TableHead_Order": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a",
     "Events_TableHead_Owner": "\u0412\u043b\u0430\u0434\u0435\u043b\u0435\u0446",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "\u041f\u043e\u043a\u0430\u0437\u0430\u043d\u044b \u0441 _START_ \u043f\u043e _END_ \u0438\u0437 _TOTAL_ \u0437\u0430\u043f\u0438\u0441\u0435\u0439",
     "Events_Table_nav_next": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f",
     "Events_Table_nav_prev": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f",
diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json
index cfb6dc24..4e5421d9 100755
--- a/front/php/templates/language/zh_cn.json
+++ b/front/php/templates/language/zh_cn.json
@@ -254,6 +254,7 @@
     "Events_TableHead_IPOrder": "",
     "Events_TableHead_Order": "",
     "Events_TableHead_Owner": "",
+    "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "",
     "Events_Table_nav_next": "",
     "Events_Table_nav_prev": "",
diff --git a/server/reporting.py b/server/reporting.py
index c94e7976..8baf41fb 100755
--- a/server/reporting.py
+++ b/server/reporting.py
@@ -46,12 +46,12 @@ def get_notifications (db):
 
     # Disable reporting on events for devices where reporting is disabled based on the MAC address
     sql.execute ("""UPDATE Events SET eve_PendingAlertEmail = 0
-                    WHERE eve_PendingAlertEmail = 1 AND eve_EventType != 'Device Down' AND eve_MAC IN
+                    WHERE eve_PendingAlertEmail = 1 AND eve_EventType not in ('Device Down', 'Down Reconnected') AND eve_MAC IN
                         (
                             SELECT dev_MAC FROM Devices WHERE dev_AlertEvents = 0
 						)""")
     sql.execute ("""UPDATE Events SET eve_PendingAlertEmail = 0
-                    WHERE eve_PendingAlertEmail = 1 AND eve_EventType = 'Device Down' AND eve_MAC IN
+                    WHERE eve_PendingAlertEmail = 1 AND eve_EventType in ('Device Down', 'Down Reconnected') AND eve_MAC IN
                         (
                             SELECT dev_MAC FROM Devices WHERE dev_AlertDeviceDown = 0
 						)""")
@@ -110,7 +110,7 @@ def get_notifications (db):
     
     if 'down_reconnected' in sections:
         # Compose Reconnected Down Section 
-        # - select only Devices, that were previously down and now are Connected
+        # - select only Devices, that were previously down and now are Connected        
         sqlQuery = f"""
                         SELECT dev_Name, eve_MAC, dev_Vendor, eve_IP, eve_DateTime, eve_EventType
                         FROM Events_Devices AS reconnected_devices