diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index eb0da25734..71d22f2bd0 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -62,6 +62,7 @@ $lang->custom->percent              = $lang->stage->percent;
 $lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
 $lang->custom->beginAndEndDate      = 'Begin & End';
 $lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
+$lang->custom->limitTaskDateAction  = 'Set start and end date required';
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index fac1663afb..fe25d1a242 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -62,6 +62,7 @@ $lang->custom->percent              = $lang->stage->percent;
 $lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
 $lang->custom->beginAndEndDate      = 'Begin & End';
 $lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
+$lang->custom->limitTaskDateAction  = 'Set start and end date required';
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 0a6292fae9..6e6532e636 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -62,6 +62,7 @@ $lang->custom->percent              = $lang->stage->percent;
 $lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
 $lang->custom->beginAndEndDate      = 'Begin & End';
 $lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
+$lang->custom->limitTaskDateAction  = 'Set start and end date required';
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index eafcbd0115..7e791b65ea 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -62,6 +62,7 @@ $lang->custom->percent              = $lang->stage->percent;
 $lang->custom->setPercent           = "是否启用{$lang->stage->percent}";
 $lang->custom->beginAndEndDate      = '起止日期';
 $lang->custom->beginAndEndDateRange = '起止日期范围';
+$lang->custom->limitTaskDateAction  = '设置起止日期必填';
 
 $lang->custom->unitList['efficiency'] = '工时/';
 $lang->custom->unitList['manhour']    = '人时/';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 94789ac70c..e2e5b6df13 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1448,7 +1448,7 @@ $lang->resource->custom->kanban             = 'kanban';
 $lang->resource->custom->code               = 'code';
 $lang->resource->custom->hours              = 'hours';
 $lang->resource->custom->percent            = 'percent';
-$lang->resource->custom->limitTaskDate      = 'beginAndEndDate';
+$lang->resource->custom->limitTaskDate      = 'limitTaskDateAction';
 
 $lang->custom->methodOrder[10] = 'set';
 $lang->custom->methodOrder[15] = 'product';
diff --git a/module/group/model.php b/module/group/model.php
index b0300104cd..82b7b20ef2 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -1289,7 +1289,7 @@ class groupModel extends model
             foreach($views as $moduleMenu)
             {
                 $viewID = 0;
-                if($moduleMenu != 'general')
+                if($moduleMenu != 'general' and isset($this->lang->mainNav->{$moduleMenu}))
                 {
                     if(!$hasStored)
                     {
@@ -1332,7 +1332,7 @@ class groupModel extends model
                     if(!$hasStored)
                     {
                         $moduleData = new stdclass();
-                        $moduleData->parent = $viewID;
+                        $moduleData->parent = (isset($this->lang->navGroup->{$moduleName}) and !in_array($moduleMenu, array('misc', 'conference'))) ? $viewPairs[$moduleMenu] : 0;
                         $moduleData->code   = $moduleName;
                         $moduleData->type   = 'module';
                         $moduleData->order  = $moduleOrder * 10;