diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
index 8629dd7c..855b67d7 100644
--- a/application/controllers/ServiceController.php
+++ b/application/controllers/ServiceController.php
@@ -60,7 +60,7 @@ class ServiceController extends ObjectController
                 'urlParams' => array('name' => $this->host->object_name),
                 'label'     => $this->translate('Services'),
             ));
-        } elseif ($this->set) {
+        } elseif ($this->host) {
             $this->getTabs()->add('services', array(
                 'url'       => 'director/serviceset/services',
                 'urlParams' => array('name' => $this->set->object_name),
diff --git a/library/Director/Web/Controller/ObjectsController.php b/library/Director/Web/Controller/ObjectsController.php
index 6020c288..6f82afe3 100644
--- a/library/Director/Web/Controller/ObjectsController.php
+++ b/library/Director/Web/Controller/ObjectsController.php
@@ -68,10 +68,12 @@ abstract class ObjectsController extends ActionController
         }
 
         if ($object->supportsSets() || $object->isGroup() /** Bullshit, need base object, wrong on users */) {
+            /** forced to master, disabled for now
             $tabs->add('sets', array(
                 'url'       => sprintf('director/%ss/sets', $type),
                 'label'     => $this->translate('Sets')
             ));
+            */
         }
 
         $tabs->add('tree', array(