diff --git a/application/forms/IcingaCommandForm.php b/application/forms/IcingaCommandForm.php
index a1049d90..9848487d 100644
--- a/application/forms/IcingaCommandForm.php
+++ b/application/forms/IcingaCommandForm.php
@@ -17,14 +17,19 @@ class IcingaCommandForm extends DirectorObjectForm
             'label' => $this->translate('Command type'),
             'multiOptions' => array(
                 null                 => '- please choose -',
-                'PluginCheck'        => 'Plugin Check Command',
-                'PluginNotification' => 'Notification Plugin Command',
-                'PluginEvent'        => 'Event Plugin Command',
-                'IcingaCheck'        => 'Icinga Check Command',
-                'ClusterCheck'       => 'Icinga Cluster Command',
-                'RandomCheck'        => 'Random Check Command',
-                'ClusterZoneCheck'   => 'Icinga Cluster Zone Check Command',
-                'CrlCheck'           => 'Crl Check Command',
+                $this->translate('Plugin commands') => array(
+                    'PluginCheck'        => 'Plugin Check Command',
+                    'PluginNotification' => 'Notification Plugin Command',
+                    'PluginEvent'        => 'Event Plugin Command',
+                ),
+                $this->translate('Internal commands') => array(
+                    'IcingaCheck'        => 'Icinga Check Command',
+                    'ClusterCheck'       => 'Icinga Cluster Check Command',
+                    'ClusterZoneCheck'   => 'Icinga Cluster Zone Check Command',
+                    'IdoCheck'           => 'Ido Check Command',
+                    'RandomCheck'        => 'Random Check Command',
+                    'CrlCheck'           => 'Crl Check Command',
+                )
             ),
             'required'    => ! $this->isTemplate(),
             'description' => $this->translate(