diff --git a/front/plugins/notification_processing/config.json b/front/plugins/notification_processing/config.json
index 7a97e969..fbdee993 100755
--- a/front/plugins/notification_processing/config.json
+++ b/front/plugins/notification_processing/config.json
@@ -225,7 +225,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "Custom text template for new device notifications. Use <code>{FieldName}</code> placeholders, e.g. <code>{devName} ({eveMac}) - {eveIp}</code>. Leave empty for default formatting. Available fields: <code>{devName}</code>, <code>{eveMac}</code>, <code>{devVendor}</code>, <code>{eveIp}</code>, <code>{eveDateTime}</code>, <code>{eveEventType}</code>, <code>{devComments}</code>."
+          "string": "Custom text template for new device notifications. Use <code>{FieldName}</code> placeholders, e.g. <code>{devName} ({eveMac}) - {eveIp}</code>. Leave empty for default formatting. Available fields: <code>{devName}</code>, <code>{eveMac}</code>, <code>{devVendor}</code>, <code>{eveIp}</code>, <code>{eveDateTime}</code>, <code>{eveEventType}</code>, <code>{devComments}</code>, <code>{devVlan}</code>, <code>{devSite}</code>, <code>{devSSID}</code>."
         }
       ]
     },
@@ -249,7 +249,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "Custom text template for down device notifications. Use <code>{FieldName}</code> placeholders, e.g. <code>{devName} ({eveMac}) - {eveIp}</code>. Leave empty for default formatting. Available fields: <code>{devName}</code>, <code>{eveMac}</code>, <code>{devVendor}</code>, <code>{eveIp}</code>, <code>{eveDateTime}</code>, <code>{eveEventType}</code>, <code>{devComments}</code>."
+          "string": "Custom text template for down device notifications. Use <code>{FieldName}</code> placeholders, e.g. <code>{devName} ({eveMac}) - {eveIp}</code>. Leave empty for default formatting. Available fields: <code>{devName}</code>, <code>{eveMac}</code>, <code>{devVendor}</code>, <code>{eveIp}</code>, <code>{eveDateTime}</code>, <code>{eveEventType}</code>, <code>{devComments}</code>, <code>{devVlan}</code>, <code>{devSite}</code>, <code>{devSSID}</code>."
         }
       ]
     },
@@ -273,7 +273,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "Custom text template for reconnected device notifications. Use <code>{FieldName}</code> placeholders, e.g. <code>{devName} ({eveMac}) reconnected at {eveDateTime}</code>. Leave empty for default formatting. Available fields: <code>{devName}</code>, <code>{eveMac}</code>, <code>{devVendor}</code>, <code>{eveIp}</code>, <code>{eveDateTime}</code>, <code>{eveEventType}</code>, <code>{devComments}</code>."
+          "string": "Custom text template for reconnected device notifications. Use <code>{FieldName}</code> placeholders, e.g. <code>{devName} ({eveMac}) reconnected at {eveDateTime}</code>. Leave empty for default formatting. Available fields: <code>{devName}</code>, <code>{eveMac}</code>, <code>{devVendor}</code>, <code>{eveIp}</code>, <code>{eveDateTime}</code>, <code>{eveEventType}</code>, <code>{devComments}</code>, <code>{devVlan}</code>, <code>{devSite}</code>, <code>{devSSID}</code>."
         }
       ]
     },
@@ -297,7 +297,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "Custom text template for event notifications. Use <code>{FieldName}</code> placeholders, e.g. <code>{devName} ({eveMac}) {eveEventType} at {eveDateTime}</code>. Leave empty for default formatting. Available fields: <code>{devName}</code>, <code>{eveMac}</code>, <code>{devVendor}</code>, <code>{eveIp}</code>, <code>{eveDateTime}</code>, <code>{eveEventType}</code>, <code>{devComments}</code>."
+          "string": "Custom text template for event notifications. Use <code>{FieldName}</code> placeholders, e.g. <code>{devName} ({eveMac}) {eveEventType} at {eveDateTime}</code>. Leave empty for default formatting. Available fields: <code>{devName}</code>, <code>{eveMac}</code>, <code>{devVendor}</code>, <code>{eveIp}</code>, <code>{eveDateTime}</code>, <code>{eveEventType}</code>, <code>{devComments}</code>, <code>{devVlan}</code>, <code>{devSite}</code>, <code>{devSSID}</code>."
         }
       ]
     },
diff --git a/front/plugins/rest_import/config.json b/front/plugins/rest_import/config.json
index 5ae42a03..a757f853 100644
--- a/front/plugins/rest_import/config.json
+++ b/front/plugins/rest_import/config.json
@@ -1171,7 +1171,8 @@
         "devSite",
         "devType",
         "devParentMAC",
-        "devParentPort"
+        "devParentPort",
+        "devVlan"
       ],
       "localized": [
         "name",
diff --git a/server/messaging/notification_sections.py b/server/messaging/notification_sections.py
index 031d54b2..38d1f369 100644
--- a/server/messaging/notification_sections.py
+++ b/server/messaging/notification_sections.py
@@ -52,7 +52,10 @@ SQL_TEMPLATES = {
             devLastIP as eveIp,
             eveDateTime,
             eveEventType,
-            devComments
+            devComments,
+            devVlan,
+            devSite,
+            devSSID
         FROM Events_Devices
         WHERE evePendingAlertEmail = 1
           AND eveEventType = 'New Device' {condition}
@@ -66,7 +69,10 @@ SQL_TEMPLATES = {
             eveIp,
             eveDateTime,
             eveEventType,
-            devComments
+            devComments,
+            devVlan,
+            devSite,
+            devSSID
         FROM Events_Devices AS down_events
         WHERE evePendingAlertEmail = 1
           AND down_events.eveEventType = 'Device Down'
@@ -88,7 +94,10 @@ SQL_TEMPLATES = {
             reconnected_devices.eveIp,
             reconnected_devices.eveDateTime,
             reconnected_devices.eveEventType,
-            devComments
+            devComments,
+            devVlan,
+            devSite,
+            devSSID
         FROM Events_Devices AS reconnected_devices
         WHERE reconnected_devices.eveEventType = 'Down Reconnected'
           AND reconnected_devices.evePendingAlertEmail = 1
@@ -109,7 +118,10 @@ SQL_TEMPLATES = {
             devLastIP as eveIp,
             eveDateTime,
             eveEventType,
-            devComments
+            devComments,
+            devVlan,
+            devSite,
+            devSSID
         FROM Events_Devices
         WHERE evePendingAlertEmail = 1
           AND eveEventType IN ({event_types}) {condition}