diff --git a/module/admin/view/setmodule.html.php b/module/admin/view/setmodule.html.php
index 280afb8d4d..864982615c 100644
--- a/module/admin/view/setmodule.html.php
+++ b/module/admin/view/setmodule.html.php
@@ -31,13 +31,22 @@
         <tbody>
           <?php foreach($this->config->admin->module as $module => $options):?>
           <?php if(strpos(",$disabledFeatures,", ",$module,") !== false) continue;?>
+
+          <?php $hasData = false;?>
+          <?php foreach($options as $option):?>
+          <?php $code = $module . ucfirst($option);?>
+          <?php if(strpos(",$disabledFeatures,", ",$code,") !== false) continue;?>
+          <?php $hasData = true;?>
+          <?php endForeach;?>
+
+          <?php if($hasData):?>
           <tr>
             <th class='text-right'><?php echo $lang->admin->setModule->{$module};?></th>
             <td>
               <?php foreach($options as $option):?>
               <?php $code = $module . ucfirst($option);?>
               <?php if(strpos(",$disabledFeatures,", ",$code,") !== false) continue;?>
-              <?php if(strpos(",$closedFeatures,", ",$code,") !== false) continue;?>
+              <?php if(strpos(",$closedFeatures,",   ",$code,") !== false) continue;?>
               <div class='group-item'>
               <?php echo html::checkbox("module[{$code}]", array('1' => $lang->admin->setModule->{$option}), '1', "data-code='{$code}'", 'inline');?>
               <?php echo html::hidden("module[{$code}][]", '1', 'disabled');?>
@@ -48,7 +57,7 @@
               <?php foreach($options as $option):?>
               <?php $code = $module . ucfirst($option);?>
               <?php if(strpos(",$disabledFeatures,", ",$code,") !== false) continue;?>
-              <?php if(strpos(",$closedFeatures,", ",$code,") === false) continue;?>
+              <?php if(strpos(",$closedFeatures,",   ",$code,") === false) continue;?>
               <div class='group-item'>
               <?php echo html::checkbox("module[{$code}]", array('1' => $lang->admin->setModule->{$option}), '0', "data-code='{$code}'", 'inline');?>
               <?php echo html::hidden("module[{$code}][]", '0');?>
@@ -56,6 +65,7 @@
               <?php endForeach;?>
             </td>
           </tr>
+          <?php endif;?>
           <?php endForeach;?>
           <tr>
             <th></th>
diff --git a/module/custom/model.php b/module/custom/model.php
index a179d95386..9399111999 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -917,7 +917,7 @@ class customModel extends model
                 $function = 'has' . ucfirst($feature) . 'Data';
                 if(!$this->$function()) $disabledFeatures .= "$feature,";
             }
-            $disabledFeatures .= 'scrumMeasrecord,productTrack';
+            $disabledFeatures .= 'scrumMeasrecord,productTrack,productRoadmap';
         }
 
         $disabledFeatures = rtrim($disabledFeatures, ',');