diff --git a/doc/Extensions/Alerting.md b/doc/Extensions/Alerting.md
index 173ef51fd7..a549684208 100644
--- a/doc/Extensions/Alerting.md
+++ b/doc/Extensions/Alerting.md
@@ -111,6 +111,8 @@ Controls:
 Placeholders:
 
 - Hostname of the Device: `%hostname`
+- sysName of the Device: `%sysName`
+- location of the Device: `%location`
 - Title for the Alert: `%title`
 - Time Elapsed, Only available on recovery (`%state == 0`): `%elapsed`
 - Alert-ID: `%id`
diff --git a/html/includes/modal/alert_template.inc.php b/html/includes/modal/alert_template.inc.php
index 8e96f3032a..4339e1ad28 100644
--- a/html/includes/modal/alert_template.inc.php
+++ b/html/includes/modal/alert_template.inc.php
@@ -69,7 +69,7 @@ if(is_admin() === false) {
                             </span><br /><br />
                             <span><strong>Placeholders:</strong><br />
 <?php
-    $placeholders = array('hostname','title','elapsed','id','uid','faults','state','severity','rule','timestamp','contacts','key','value','new line');
+    $placeholders = array('hostname', 'sysName', 'location', 'title','elapsed','id','uid','faults','state','severity','rule','timestamp','contacts','key','value','new line');
     foreach ($placeholders as $placeholder) {
         echo '              <button type="button" class="btn btn-success btn-sm" data-target="#placeholder-add" id="placeholder-add" name="placeholder-add" data-type="placeholder" data-value="'.$placeholder.'">'.$placeholder.'</button>';
     }