diff --git a/data/interfaces/default/notification_config.html b/data/interfaces/default/notification_config.html
index dc997d5b..b9859ae1 100644
--- a/data/interfaces/default/notification_config.html
+++ b/data/interfaces/default/notification_config.html
@@ -6,7 +6,7 @@ from plexpy import helpers
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title" id="notification-config-modal-header">Set Config</h4>
+            <h4 class="modal-title" id="notification-config-modal-header">${agent['name']} Settings</h4>
         </div>
         <div class="modal-body">
             <div class="container-fluid">
@@ -88,7 +88,7 @@ from plexpy import helpers
     function reloadModal() {
         $.ajax({
             url: 'get_notification_agent_config',
-            data: { config_id: '${config_id}' },
+            data: { config_id: '${agent["id"]}' },
             cache: false,
             async: true,
             complete: function (xhr, status) {
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index e4831cbc..fb260fe6 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1353,12 +1353,22 @@ class WebInterface(object):
 
     @cherrypy.expose
     def get_notification_agent_config(self, config_id, **kwargs):
-        config = notifiers.get_notification_agent_config(config_id=config_id)
+        if config_id.isdigit():
+            config = notifiers.get_notification_agent_config(config_id=config_id)
+            agents = notifiers.available_notification_agents()
+            for agent in agents:
+                if int(config_id) == agent['id']:
+                    this_agent = agent
+                    break
+                else:
+                    this_agent = None
+        else:
+            return None
 
         checkboxes = {'email_tls': checked(plexpy.CONFIG.EMAIL_TLS)}
 
         return serve_template(templatename="notification_config.html", title="Notification Configuration",
-                              config_id=config_id, data=config, checkboxes=checkboxes)
+                              agent=this_agent, data=config, checkboxes=checkboxes)
 
     @cherrypy.expose
     def get_notification_agent_triggers(self, config_id, **kwargs):