diff --git a/data/interfaces/default/notifiers_table.html b/data/interfaces/default/notifiers_table.html
index ff448d7c..3c567e1b 100644
--- a/data/interfaces/default/notifiers_table.html
+++ b/data/interfaces/default/notifiers_table.html
@@ -10,7 +10,7 @@ DOCUMENTATION :: END
 </%doc>
 
 <ul class="stacked-configs list-unstyled">
-    % for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'], k['id'])):
+    % for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'], k['friendly_name'], k['id'])):
     <li class="notification-agent" data-id="${notifier['id']}">
         <span>
             <span class="toggle-left trigger-tooltip ${'active' if notifier['active'] else ''}" data-toggle="tooltip" data-placement="top" title="Triggers ${'active' if notifier['active'] else 'inactive'}"><i class="fa fa-lg fa-bell"></i></span>
diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py
index 1cb25acf..4beff47b 100644
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -602,12 +602,6 @@ def build_notify_text(subject='', body='', notify_action=None, parameters=None,
     subject = strip_tag(re.sub(pattern, '', subject), agent_id)
     body = strip_tag(re.sub(pattern, '', body), agent_id)
 
-    # Use default subject and body if they are blank
-    # only if the notification is not script
-    if agent_id != 15:
-        subject = subject or default_subject
-        body = body or default_body
-
     if test:
         return subject, body