diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php
index 2d35e99d..6939bb2f 100644
--- a/library/Director/Web/Form/DirectorObjectForm.php
+++ b/library/Director/Web/Form/DirectorObjectForm.php
@@ -112,6 +112,10 @@ abstract class DirectorObjectForm extends QuickForm
             $this->getElement('check_command_id')
                 ->setMultiOptions($this->optionalEnum($db->enumCheckCommands()));
         }
+        if ($this->hasElement('command_id')) {
+            $this->getElement('command_id')
+                ->setMultiOptions($this->optionalEnum($db->enumCommands()));
+        }
         return $this;
     }