diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index bf91f22500..76448e4f92 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -377,33 +377,45 @@ $lang->execution->menu->settings['subMenu']->whitelist = array('link' => "$lang-
 
 $lang->execution->dividerMenu = ',story,build,';
 
-$lang->noSprint                 = new stdclass();
-$lang->noSprint->menu           = new stdclass();
-$lang->noSprint->menu->task     = $lang->execution->menu->task;
-$lang->noSprint->menu->kanban   = $lang->execution->menu->kanban;
-$lang->noSprint->menu->burn     = $lang->execution->menu->burn;
-$lang->noSprint->menu->view     = $lang->execution->menu->view;
-$lang->noSprint->menu->story    = $lang->execution->menu->story;
-$lang->noSprint->menu->qa       = $lang->scrum->menu->qa;
-$lang->noSprint->menu->devops   = $lang->scrum->menu->devops;
-$lang->noSprint->menu->doc      = $lang->scrum->menu->doc;
-$lang->noSprint->menu->build    = $lang->scrum->menu->build;
-$lang->noSprint->menu->dynamic  = $lang->scrum->menu->dynamic;
-$lang->noSprint->menu->settings = $lang->scrum->menu->settings;
+$lang->noSprint                        = new stdclass();
+$lang->noSprint->scrum                 = new stdclass();
+$lang->noSprint->scrum->menu           = new stdclass();
+$lang->noSprint->scrum->menu->task     = $lang->execution->menu->task;
+$lang->noSprint->scrum->menu->kanban   = $lang->execution->menu->kanban;
+$lang->noSprint->scrum->menu->burn     = $lang->execution->menu->burn;
+$lang->noSprint->scrum->menu->view     = $lang->execution->menu->view;
+$lang->noSprint->scrum->menu->story    = $lang->execution->menu->story;
+$lang->noSprint->scrum->menu->qa       = $lang->scrum->menu->qa;
+$lang->noSprint->scrum->menu->devops   = $lang->scrum->menu->devops;
+$lang->noSprint->scrum->menu->doc      = $lang->scrum->menu->doc;
+$lang->noSprint->scrum->menu->build    = $lang->scrum->menu->build;
+$lang->noSprint->scrum->menu->dynamic  = $lang->scrum->menu->dynamic;
+$lang->noSprint->scrum->menu->settings = $lang->scrum->menu->settings;
 
-$lang->noSprint->dividerMenu = ',story,build,';
+$lang->noSprint->kanban                 = new stdclass();
+$lang->noSprint->kanban->menu           = new stdclass();
+$lang->noSprint->kanban->menu->kanban   = array('link' => "{$lang->kanban->common}|execution|kanban|executionID=%s");
+$lang->noSprint->kanban->menu->build    = $lang->kanbanProject->menu->build;
+$lang->noSprint->kanban->menu->settings = $lang->kanbanProject->menu->settings;
 
-$lang->noSprint->menuOrder[5]  = 'task';
-$lang->noSprint->menuOrder[10] = 'kanban';
-$lang->noSprint->menuOrder[15] = 'burn';
-$lang->noSprint->menuOrder[20] = 'view';
-$lang->noSprint->menuOrder[25] = 'story';
-$lang->noSprint->menuOrder[30] = 'qa';
-$lang->noSprint->menuOrder[35] = 'devops';
-$lang->noSprint->menuOrder[40] = 'doc';
-$lang->noSprint->menuOrder[45] = 'build';
-$lang->noSprint->menuOrder[50] = 'dynamic';
-$lang->noSprint->menuOrder[55] = 'settings';
+$lang->noSprint->scrum->dividerMenu  = ',story,build,';
+$lang->noSprint->kanban->dividerMenu = '';
+
+$lang->noSprint->scrum->menuOrder[5]  = 'task';
+$lang->noSprint->scrum->menuOrder[10] = 'kanban';
+$lang->noSprint->scrum->menuOrder[15] = 'burn';
+$lang->noSprint->scrum->menuOrder[20] = 'view';
+$lang->noSprint->scrum->menuOrder[25] = 'story';
+$lang->noSprint->scrum->menuOrder[30] = 'qa';
+$lang->noSprint->scrum->menuOrder[35] = 'devops';
+$lang->noSprint->scrum->menuOrder[40] = 'doc';
+$lang->noSprint->scrum->menuOrder[45] = 'build';
+$lang->noSprint->scrum->menuOrder[50] = 'dynamic';
+$lang->noSprint->scrum->menuOrder[55] = 'settings';
+
+$lang->noSprint->kanban->menuOrder[5]  = 'kanban';
+$lang->noSprint->kanban->menuOrder[10] = 'build';
+$lang->noSprint->kanban->menuOrder[15] = 'settings';
 
 /* QA menu.*/
 $lang->qa->menu = new stdclass();
diff --git a/module/project/model.php b/module/project/model.php
index 7fb29735d5..05afe38338 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2499,14 +2499,14 @@ class projectModel extends model
         $this->config->resetNavGroup['story']     = zget($this->lang->navGroup, 'story');
         $this->config->resetNavGroup[$moduleName] = $navGroup;
 
-
         $project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($objectID)->andWhere('noSprint')->eq('1')->fetch();
         if(empty($project)) return;
 
-        if($project->type != 'project' and $project->type != 'sprint') return;
+        if(!in_array($project->type, array('project', 'sprint', 'kanban'))) return;
 
         if($project->type == 'project')
         {
+            $modal       = $project->model;
             $projectID   = $project->id;
             $executionID = $this->dao->select('id')->from(TABLE_EXECUTION)
                 ->where('project')->eq($projectID)
@@ -2515,8 +2515,9 @@ class projectModel extends model
                 ->andWhere('deleted')->eq('0')
                 ->fetch('id');
         }
-        elseif($project->type == 'sprint')
+        else
         {
+            $modal       = $project->type == 'kanban' ? 'kanban' : 'scrum';
             $executionID = $project->id;
             $projectID   = $project->project;
         }
@@ -2529,9 +2530,9 @@ class projectModel extends model
         $_COOKIE['tab'] = 'project';
 
         $this->lang->navGroup->$moduleName   = 'project';
-        $this->lang->$navGroup->menu         = $this->lang->noSprint->menu;
-        $this->lang->$navGroup->menuOrder    = $this->lang->noSprint->menuOrder;
-        $this->lang->$navGroup->dividerMenu  = $this->lang->noSprint->dividerMenu;
+        $this->lang->$navGroup->menu         = $this->lang->noSprint->{$modal}->menu;
+        $this->lang->$navGroup->menuOrder    = $this->lang->noSprint->{$modal}->menuOrder;
+        $this->lang->$navGroup->dividerMenu  = $this->lang->noSprint->{$modal}->dividerMenu;
 
         foreach($this->lang->$navGroup->menu as $label => $menu)
         {
@@ -2564,6 +2565,7 @@ class projectModel extends model
         $this->config->resetNavGroup[$moduleName] = 'project';
 
         /* If objectID is set, cannot use homeMenu. */
+        unset($this->lang->project->homeMenu);
         unset($this->lang->$navGroup->homeMenu);
         $this->lang->switcherMenu         = $this->getSwitcher($projectID, $moduleName, $methodName);
         $this->lang->project->menu        = $this->lang->$navGroup->menu;
diff --git a/module/user/model.php b/module/user/model.php
index 68a89ddc69..53187d0488 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -2975,7 +2975,7 @@ class userModel extends model
      */
     public function processAccountSort($users = array())
     {
-        if(isset($users[$this->app->user->account]))
+        if(isset($this->app->user->account) && isset($users[$this->app->user->account]))
         {
             $currentUser = array();
             $currentUser[$this->app->user->account] = $users[$this->app->user->account];