diff --git a/application/forms/IcingaServiceForm.php b/application/forms/IcingaServiceForm.php
index 2ba934de..d138251e 100644
--- a/application/forms/IcingaServiceForm.php
+++ b/application/forms/IcingaServiceForm.php
@@ -136,7 +136,18 @@ class IcingaServiceForm extends DirectorObjectForm
             array('data-base-target' => '_next')
         );
 
-        $this->addHtmlHint(sprintf($msg, $link));
+        $this->addHtmlHint(
+            sprintf($msg, $link),
+            array('name' => 'inheritance_hint')
+        );
+
+        $this->addElementsToGroup(
+            array('inheritance_hint'),
+            'custom_fields',
+            50,
+            $this->translate('Custom properties')
+        );
+
         $this->setSubmitLabel(
             $this->translate('Override vars')
         );
diff --git a/public/css/module.less b/public/css/module.less
index 697a55aa..4628269c 100644
--- a/public/css/module.less
+++ b/public/css/module.less
@@ -587,7 +587,7 @@ fieldset {
             margin: 0;
         }
 
-        dd, dt, ul {
+        dd, dt, ul, div {
             display: none;
         }