diff --git a/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java b/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java
index 575815ab50..0e4a34b81d 100644
--- a/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java
+++ b/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java
@@ -105,6 +105,7 @@ public void updateVariableList() {
         variables.add("alertId");
         variables.add("alertName");
         variables.add("serverId");
+        variables.add("serverName");
         variables.add("globalMapVariable");
         variables.add("date");
 
diff --git a/server/src/com/mirth/connect/server/alert/Alert.java b/server/src/com/mirth/connect/server/alert/Alert.java
index 2b60cdfd14..f219fe4b25 100644
--- a/server/src/com/mirth/connect/server/alert/Alert.java
+++ b/server/src/com/mirth/connect/server/alert/Alert.java
@@ -56,6 +56,7 @@ public Map<String, Object> createContext() {
         context.put("alertId", model.getId());
         context.put("alertName", model.getName());
         context.put("serverId", ConfigurationController.getInstance().getServerId());
+        context.put("serverName", ConfigurationController.getInstance().getServerName());
         context.put("date", new DateTool());
 
         return context;