diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 16bef330f0..98e57e1a67 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -36,6 +36,7 @@ $lang->mainNav->menuOrder[45] = 'admin';
 /* My menu. */
 $lang->my->menu = new stdclass();
 $lang->my->menu->index      = array('link' => "$lang->dashboard|my|index");
+$lang->my->menu->calendar   = array('link' => "$lang->calendar|my|calendar|", 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->work       = array('link' => "{$lang->my->work}|my|work|mode=task");
 if($config->systemMode == 'new') $lang->my->menu->project = array('link' => "{$lang->project->common}|my|project|");
 $lang->my->menu->execution  = array('link' => "{$lang->execution->common}|my|execution|type=undone");
@@ -46,14 +47,15 @@ $lang->my->menu->contacts   = array('link' => "$lang->contact|my|managecontacts|
 
 /* My menu order. */
 $lang->my->menuOrder[5]  = 'index';
-$lang->my->menuOrder[10] = 'work';
-$lang->my->menuOrder[15] = 'project';
-$lang->my->menuOrder[20] = 'execution';
-$lang->my->menuOrder[25] = 'contribute';
-$lang->my->menuOrder[30] = 'score';
-$lang->my->menuOrder[35] = 'dynamic';
-$lang->my->menuOrder[40] = 'follow';
-$lang->my->menuOrder[45] = 'contacts';
+$lang->my->menuOrder[10] = 'calendar';
+$lang->my->menuOrder[15] = 'work';
+$lang->my->menuOrder[20] = 'project';
+$lang->my->menuOrder[25] = 'execution';
+$lang->my->menuOrder[30] = 'contribute';
+$lang->my->menuOrder[35] = 'score';
+$lang->my->menuOrder[40] = 'dynamic';
+$lang->my->menuOrder[45] = 'follow';
+$lang->my->menuOrder[50] = 'contacts';
 
 $lang->my->menu->work['subMenu'] = new stdclass();
 $lang->my->menu->work['subMenu']->task     = "{$lang->task->common}|my|work|mode=task";
@@ -445,7 +447,6 @@ $lang->subject->menu->storyConcept = array('link' => "{$lang->subject->storyConc
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
 $lang->system->menu->team     = array('link' => "{$lang->team->common}|my|team|", 'subModule' => 'user');
-$lang->system->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'subModule' => 'todo', 'alias' => 'todo');
 $lang->system->menu->dynamic  = array('link' => "$lang->dynamic|company|dynamic|");
 $lang->system->menu->view     = array('link' => "{$lang->company->common}|company|view");
 
diff --git a/module/common/model.php b/module/common/model.php
index 7c88c57cac..5f0a4d1983 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -125,7 +125,7 @@ class commonModel extends model
     public function setOpenApp()
     {
         $openApp = $this->app->openApp;
-        if($this->lang->navGroup->$openApp)
+        if(isset($this->lang->navGroup->$openApp))
         {
             $this->app->openApp = $this->lang->navGroup->$openApp;
         }
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 405a04d2d4..c8f05a1e7a 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -120,7 +120,7 @@
         }
         if(moduleName === 'my')    
         {
-            if(['todo', 'team', 'calendar'].includes(methodLowerCase)) return 'system';
+            if(['team'].includes(methodLowerCase)) return 'system';
         }
         if(moduleName === 'company') if(methodLowerCase == 'browse') return 'admin';
         if(moduleName === 'tree')
diff --git a/module/my/control.php b/module/my/control.php
index 9048db3ede..4205228d1d 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -129,7 +129,6 @@ class my extends control
      */
     public function todo($type = 'before', $userID = '', $status = 'all', $orderBy = "date_desc,status,begin", $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->lang->navGroup->my = 'system';
         /* Save session. */
         $uri = $this->app->getURI(true);
         if($this->app->viewType != 'json')