diff --git a/library/Director/Db.php b/library/Director/Db.php
index 33b470fe..0e4fe69b 100644
--- a/library/Director/Db.php
+++ b/library/Director/Db.php
@@ -557,6 +557,14 @@ class Db extends DbConnection
         return $this->enumIcingaObjects('command', $filters);
     }
 
+    public function enumNotificationCommands()
+    {
+        $filters = array(
+            'methods_execute IN (?)' => array('PluginNotification'),
+        );
+        return $this->enumIcingaObjects('command', $filters);
+    }
+
     public function getZoneName($id)
     {
         $objects = $this->enumZones();
diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php
index afa3b5f6..aa052b0c 100644
--- a/library/Director/Web/Form/DirectorObjectForm.php
+++ b/library/Director/Web/Form/DirectorObjectForm.php
@@ -415,6 +415,7 @@ abstract class DirectorObjectForm extends QuickForm
             'address',
             'address6',
             'groups',
+            'command_id', // Notification
             'email',
             'pager',
             'enable_notifications',