diff --git a/src/core/class.application.php b/src/core/class.application.php
index da1797d86..1a8edb88e 100644
--- a/src/core/class.application.php
+++ b/src/core/class.application.php
@@ -54,7 +54,7 @@ public function start()
         $language = $this->language;
         $telemetryResponse = false;
 
-        //Override theme appSettings
+        //Override theme settings
         $this->overrideThemeSettings();
 
         $this->loadHeaders();
diff --git a/src/domain/api/controllers/class.files.php b/src/domain/api/controllers/class.files.php
index 1c6b49053..85654d856 100644
--- a/src/domain/api/controllers/class.files.php
+++ b/src/domain/api/controllers/class.files.php
@@ -70,11 +70,11 @@ public function post($params)
          */
         public function patch($params)
         {
-            //Special handling for appSettings
+            //Special handling for settings
 
             if(isset($params['patchModalSettings'])) {
 
-                if($this->usersService->updateUserSettings("modals", $params['appSettings'], 1)) {
+                if($this->usersService->updateUserSettings("modals", $params['settings'], 1)) {
                     echo "{status:ok}";
                 }
             }
diff --git a/src/domain/api/controllers/class.sessions.php b/src/domain/api/controllers/class.sessions.php
index 7072f54fc..32ec7d665 100644
--- a/src/domain/api/controllers/class.sessions.php
+++ b/src/domain/api/controllers/class.sessions.php
@@ -62,7 +62,7 @@ public function post($params)
          */
         public function patch($params)
         {
-            //Special handling for appSettings
+            //Special handling for settings
 
             if(isset($params['tourActive'])) {
 
diff --git a/src/domain/api/controllers/class.users.php b/src/domain/api/controllers/class.users.php
index f135ac202..51ab9a992 100644
--- a/src/domain/api/controllers/class.users.php
+++ b/src/domain/api/controllers/class.users.php
@@ -92,11 +92,11 @@ public function post($params)
          */
         public function patch($params)
         {
-            //Special handling for appSettings
+            //Special handling for settings
 
             if(isset($params['patchModalSettings'])) {
 
-                if($this->usersService->updateUserSettings("modals", $params['appSettings'], 1)) {
+                if($this->usersService->updateUserSettings("modals", $params['settings'], 1)) {
                     echo "{status:ok}";
                 }
             }
diff --git a/src/domain/clients/templates/showAll.tpl.php b/src/domain/clients/templates/showAll.tpl.php
index 14d55ec80..c0b0fa7ad 100644
--- a/src/domain/clients/templates/showAll.tpl.php
+++ b/src/domain/clients/templates/showAll.tpl.php
@@ -58,11 +58,11 @@
 
             leantime.clientsController.initClientTable();
 
-            <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["showClients"]) === false || $_SESSION['userdata']['appSettings']["modals"]["showClients"] == 0) {     ?>
+            <?php if(isset($_SESSION['userdata']['settings']["modals"]["showClients"]) === false || $_SESSION['userdata']['settings']["modals"]["showClients"] == 0) {     ?>
             leantime.helperController.showHelperModal("showClients");
             <?php
             //Only show once per session
-            $_SESSION['userdata']['appSettings']["modals"]["showClients"] = 1;
+            $_SESSION['userdata']['settings']["modals"]["showClients"] = 1;
             } ?>
 
         }
diff --git a/src/domain/dashboard/templates/show.tpl.php b/src/domain/dashboard/templates/show.tpl.php
index dfc8c52df..9d0e3e00a 100644
--- a/src/domain/dashboard/templates/show.tpl.php
+++ b/src/domain/dashboard/templates/show.tpl.php
@@ -449,13 +449,13 @@
 
        <?php } ?>
 
-       <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["dashboard"]) === false || $_SESSION['userdata']['appSettings']["modals"]["dashboard"] == 0){  ?>
+       <?php if(isset($_SESSION['userdata']['settings']["modals"]["dashboard"]) === false || $_SESSION['userdata']['settings']["modals"]["dashboard"] == 0){  ?>
 
            leantime.helperController.showHelperModal("dashboard", 500, 700);
 
        <?php
             //Only show once per session
-            $_SESSION['userdata']['appSettings']["modals"]["dashboard"] = 1;
+            $_SESSION['userdata']['settings']["modals"]["dashboard"] = 1;
        } ?>
 
     });
diff --git a/src/domain/errors/controllers/class.error404.php b/src/domain/errors/controllers/class.error404.php
new file mode 100644
index 000000000..58d58828c
--- /dev/null
+++ b/src/domain/errors/controllers/class.error404.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace leantime\domain\controllers {
+
+    use leantime\core;
+
+    class error404
+    {
+
+        public function run()
+        {
+
+            $tpl = new core\template();
+
+            $tpl->display('errors.error404');
+        }
+    }
+}
diff --git a/src/domain/errors/templates/error404.tpl.php b/src/domain/errors/templates/error404.tpl.php
new file mode 100644
index 000000000..ed1c1b123
--- /dev/null
+++ b/src/domain/errors/templates/error404.tpl.php
@@ -0,0 +1,14 @@
+<?php defined('RESTRICTED') or die('Restricted access'); ?>
+
+<div class="errortitle">
+
+    <h4 class="animate0 fadeInUp"><?php echo $this->__('headlines.page_not_found') ?></h4>
+    <span class="animate1 bounceIn">4</span>
+    <span class="animate2 bounceIn">0</span>
+    <span class="animate3 bounceIn">4</span>
+    <div class="errorbtns animate4 fadeInUp">
+        <a onclick="history.back()" class="btn btn-default"><?php echo $this->__('buttons.back') ?></a>
+        <a href="<?=BASE_URL ?>" class="btn btn-primary"><?php echo $this->__('links.dashboard') ?></a>
+    </div><br/><br/><br/><br/>
+
+</div>
diff --git a/src/domain/ideas/templates/advancedBoards.tpl.php b/src/domain/ideas/templates/advancedBoards.tpl.php
index 408a85eda..92bce3664 100644
--- a/src/domain/ideas/templates/advancedBoards.tpl.php
+++ b/src/domain/ideas/templates/advancedBoards.tpl.php
@@ -282,11 +282,11 @@ class="addCanvasLink btn btn-primary"><?php echo $this->__("buttons.start_new_id
         leantime.ideasController.initUserDropdown();
 
 
-        <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["advancedBoards"]) === false || $_SESSION['userdata']['appSettings']["modals"]["advancedBoards"] == 0) {     ?>
+        <?php if(isset($_SESSION['userdata']['settings']["modals"]["advancedBoards"]) === false || $_SESSION['userdata']['settings']["modals"]["advancedBoards"] == 0) {     ?>
         leantime.helperController.showHelperModal("advancedBoards");
         <?php
         //Only show once per session
-        $_SESSION['userdata']['appSettings']["modals"]["advancedBoards"] = 1;
+        $_SESSION['userdata']['settings']["modals"]["advancedBoards"] = 1;
         } ?>
 
     });
diff --git a/src/domain/ideas/templates/showBoards.tpl.php b/src/domain/ideas/templates/showBoards.tpl.php
index 0ed60b0b8..fbeeada0d 100644
--- a/src/domain/ideas/templates/showBoards.tpl.php
+++ b/src/domain/ideas/templates/showBoards.tpl.php
@@ -273,11 +273,11 @@ class="addCanvasLink btn btn-primary"><?php echo $this->__("buttons.start_new_id
         leantime.ideasController.initStatusDropdown();
         leantime.ideasController.initUserDropdown();
 
-        <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["ideaBoard"]) === false || $_SESSION['userdata']['appSettings']["modals"]["ideaBoard"] == 0) {     ?>
+        <?php if(isset($_SESSION['userdata']['settings']["modals"]["ideaBoard"]) === false || $_SESSION['userdata']['settings']["modals"]["ideaBoard"] == 0) {     ?>
             leantime.helperController.showHelperModal("ideaBoard");
         <?php
         //Only show once per session
-        $_SESSION['userdata']['appSettings']["modals"]["ideaBoard"] = 1;
+        $_SESSION['userdata']['settings']["modals"]["ideaBoard"] = 1;
         } ?>
 
         <?php if(isset($_GET['showIdeaModal'])) {
diff --git a/src/domain/leancanvas/templates/showCanvas.tpl.php b/src/domain/leancanvas/templates/showCanvas.tpl.php
index 9736ed6c7..4ccba22f4 100644
--- a/src/domain/leancanvas/templates/showCanvas.tpl.php
+++ b/src/domain/leancanvas/templates/showCanvas.tpl.php
@@ -1566,12 +1566,12 @@
         leantime.leanCanvasController.initStatusDropdown();
 
 
-        <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["fullLeanCanvas"]) === false || $_SESSION['userdata']['appSettings']["modals"]["fullLeanCanvas"] == 0) {     ?>
+        <?php if(isset($_SESSION['userdata']['settings']["modals"]["fullLeanCanvas"]) === false || $_SESSION['userdata']['settings']["modals"]["fullLeanCanvas"] == 0) {     ?>
             leantime.helperController.showHelperModal("fullLeanCanvas");
 
         <?php
             //Only show once per session
-            $_SESSION['userdata']['appSettings']["modals"]["fullLeanCanvas"] = 1;
+            $_SESSION['userdata']['settings']["modals"]["fullLeanCanvas"] = 1;
         } ?>
 
     });
diff --git a/src/domain/leancanvas/templates/simpleCanvas.tpl.php b/src/domain/leancanvas/templates/simpleCanvas.tpl.php
index ed645c4b0..8143e3aea 100644
--- a/src/domain/leancanvas/templates/simpleCanvas.tpl.php
+++ b/src/domain/leancanvas/templates/simpleCanvas.tpl.php
@@ -18,11 +18,11 @@
          leantime.leanCanvasController.initUserDropdown();
          leantime.leanCanvasController.initStatusDropdown();
 
-        <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["simpleLeanCanvas"]) === false || $_SESSION['userdata']['appSettings']["modals"]["simpleLeanCanvas"] == 0) {     ?>
+        <?php if(isset($_SESSION['userdata']['settings']["modals"]["simpleLeanCanvas"]) === false || $_SESSION['userdata']['settings']["modals"]["simpleLeanCanvas"] == 0) {     ?>
           leantime.helperController.showHelperModal("simpleLeanCanvas");
             <?php
             //Only show once per session
-            $_SESSION['userdata']['appSettings']["modals"]["simpleLeanCanvas"] = 1;
+            $_SESSION['userdata']['settings']["modals"]["simpleLeanCanvas"] = 1;
         } ?>
 
 
diff --git a/src/domain/modulemanager/services/class.moduleManager.php b/src/domain/modulemanager/services/class.moduleManager.php
index c03283bb0..183bb25db 100644
--- a/src/domain/modulemanager/services/class.moduleManager.php
+++ b/src/domain/modulemanager/services/class.moduleManager.php
@@ -18,27 +18,27 @@ class modulemanager
 
         private static $modules = array(
             "api" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "system"),
-            "calendar" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "project"),
+            "calendar" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
             "clients" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "system"),
             "comments" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
             "dashboard" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "project"),
             "files" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
             "general" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "system"),
             "help" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
-            "ideas" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "ldap" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "leancanvas" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "projects" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "read" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "reports" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "retrospectives" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "setting" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "sprints" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "tickets" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "timesheets" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "twoFA" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "users" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
-            "modulemanager" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "company"),
+            "ideas" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
+            "ldap" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "system"),
+            "leancanvas" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
+            "projects" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "system"),
+            "read" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "system"),
+            "reports" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
+            "retrospectives" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
+            "setting" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "system"),
+            "sprints" => array("required" => false, "enabled" => true, "dependsOn" => "tickets", "scope" => "project"),
+            "tickets" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "project"),
+            "timesheets" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "project"),
+            "twoFA" => array("required" => false, "enabled" => true, "dependsOn" => "", "scope" => "system"),
+            "users" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "system"),
+            "modulemanager" => array("required" => true, "enabled" => true, "dependsOn" => "", "scope" => "system"),
         );
 
 
@@ -68,6 +68,18 @@ public static function getInstance()
             return self::$instance;
         }
 
+        public static function isModuleEnabled($module) {
+
+            if(isset(self::$modules[$module])) {
+                if(self::$modules[$module]['enabled'] === true) {
+                    return true;
+                }
+            }
+
+            return false;
+
+        }
+
 
     }
 
diff --git a/src/domain/projects/templates/newProject.tpl.php b/src/domain/projects/templates/newProject.tpl.php
index 54f33de4a..fa596fbe5 100644
--- a/src/domain/projects/templates/newProject.tpl.php
+++ b/src/domain/projects/templates/newProject.tpl.php
@@ -44,12 +44,12 @@
             leantime.projectsController.initProjectTabs();
             leantime.projectsController.initProjectsEditor();
 
-            <?php if((isset($_SESSION['userdata']['appSettings']["modals"]["newProject"]) === false || $_SESSION['userdata']['appSettings']["modals"]["newProject"] == 0) && $_SESSION['currentProject'] != '') {     ?>
+            <?php if((isset($_SESSION['userdata']['settings']["modals"]["newProject"]) === false || $_SESSION['userdata']['settings']["modals"]["newProject"] == 0) && $_SESSION['currentProject'] != '') {     ?>
 
             leantime.helperController.showHelperModal("newProject");
             <?php
             //Only show once per session
-            $_SESSION['userdata']['appSettings']["modals"]["newProject"] = 1;
+            $_SESSION['userdata']['settings']["modals"]["newProject"] = 1;
             } ?>
 
         }
diff --git a/src/domain/projects/templates/showAll.tpl.php b/src/domain/projects/templates/showAll.tpl.php
index 84720b788..48a278978 100644
--- a/src/domain/projects/templates/showAll.tpl.php
+++ b/src/domain/projects/templates/showAll.tpl.php
@@ -67,11 +67,11 @@
 <script type="text/javascript">
     jQuery(document).ready(function() {
 
-            <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["showProjects"]) === false || $_SESSION['userdata']['appSettings']["modals"]["showProjects"] == 0){     ?>
+            <?php if(isset($_SESSION['userdata']['settings']["modals"]["showProjects"]) === false || $_SESSION['userdata']['settings']["modals"]["showProjects"] == 0){     ?>
             leantime.helperController.showHelperModal("showProjects");
             <?php
             //Only show once per session
-            $_SESSION['userdata']['appSettings']["modals"]["showProjects"] = 1;
+            $_SESSION['userdata']['settings']["modals"]["showProjects"] = 1;
             } ?>
 
             leantime.projectsController.initProjectTable();
diff --git a/src/domain/retrospectives/templates/showBoards.tpl.php b/src/domain/retrospectives/templates/showBoards.tpl.php
index 3bfc8ab4e..00c9c39c9 100644
--- a/src/domain/retrospectives/templates/showBoards.tpl.php
+++ b/src/domain/retrospectives/templates/showBoards.tpl.php
@@ -462,11 +462,11 @@ class="addCanvasLink btn btn-primary"><?php echo $this->__("buttons.start_retros
         leantime.retroController.setKanbanHeights();
 
         <?php
-        if(isset($_SESSION['userdata']['appSettings']["modals"]["retrospectives"]) === false || $_SESSION['userdata']['appSettings']["modals"]["retrospectives"] == 0) {     ?>
+        if(isset($_SESSION['userdata']['settings']["modals"]["retrospectives"]) === false || $_SESSION['userdata']['settings']["modals"]["retrospectives"] == 0) {     ?>
         leantime.helperController.showHelperModal("retrospectives");
         <?php
         //Only show once per session
-        $_SESSION['userdata']['appSettings']["modals"]["retrospectives"] = 1;
+        $_SESSION['userdata']['settings']["modals"]["retrospectives"] = 1;
         } ?>
 
         <?php if(isset($_GET['showRetroModal'])) {
diff --git a/src/domain/setting/controllers/class.editBoxLabel.php b/src/domain/setting/controllers/class.editBoxLabel.php
index 2ab3f5c53..348acf52f 100644
--- a/src/domain/setting/controllers/class.editBoxLabel.php
+++ b/src/domain/setting/controllers/class.editBoxLabel.php
@@ -52,7 +52,7 @@ public function get($params)
 
                 if (isset($params['module']) && isset($params['label'])) {
 
-                    //Move to appSettings service
+                    //Move to settings service
                     if ($params['module'] == "ticketlabels") {
                         $stateLabels = $this->ticketsRepo->getStateLabels();
                         $currentLabel = $stateLabels[$params['label']]["name"];
@@ -98,7 +98,7 @@ public function post($params)
 
                 $sanitizedString = filter_var($params['newLabel'], FILTER_SANITIZE_STRING);
 
-                //Move to appSettings service
+                //Move to settings service
                 if ($_GET['module'] == "ticketlabels") {
 
                     $currentStateLabels = $this->ticketsRepo->getStateLabels();
diff --git a/src/domain/tickets/templates/roadmap.tpl.php b/src/domain/tickets/templates/roadmap.tpl.php
index f91c52233..ab29fbfe4 100644
--- a/src/domain/tickets/templates/roadmap.tpl.php
+++ b/src/domain/tickets/templates/roadmap.tpl.php
@@ -6,8 +6,8 @@
 ?>
 
 <?php
-if(isset($_SESSION['userdata']['appSettings']['views']['roadmap'])){
-    $roadmapView = $_SESSION['userdata']['appSettings']['views']['roadmap'];
+if(isset($_SESSION['userdata']['settings']['views']['roadmap'])){
+    $roadmapView = $_SESSION['userdata']['settings']['views']['roadmap'];
 }else{
     $roadmapView = "Month";
 }
@@ -87,11 +87,11 @@
 
 <script type="text/javascript">
 jQuery(document).ready(function(){
-    <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["roadmap"]) === false || $_SESSION['userdata']['appSettings']["modals"]["roadmap"] == 0){     ?>
+    <?php if(isset($_SESSION['userdata']['settings']["modals"]["roadmap"]) === false || $_SESSION['userdata']['settings']["modals"]["roadmap"] == 0){     ?>
     leantime.helperController.showHelperModal("roadmap");
     <?php
     //Only show once per session
-    $_SESSION['userdata']['appSettings']["modals"]["roadmap"] = 1;
+    $_SESSION['userdata']['settings']["modals"]["roadmap"] = 1;
     } ?>
 
     <?php if(isset($_GET['showMilestoneModal'])) {
diff --git a/src/domain/tickets/templates/showAll.tpl.php b/src/domain/tickets/templates/showAll.tpl.php
index 1de7653e2..a2462d7f3 100644
--- a/src/domain/tickets/templates/showAll.tpl.php
+++ b/src/domain/tickets/templates/showAll.tpl.php
@@ -453,11 +453,11 @@
 
     leantime.ticketsController.initTicketsTable("<?=$searchCriteria["groupBy"] ?>");
 
-    <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["backlog"]) === false || $_SESSION['userdata']['appSettings']["modals"]["backlog"] == 0){     ?>
+    <?php if(isset($_SESSION['userdata']['settings']["modals"]["backlog"]) === false || $_SESSION['userdata']['settings']["modals"]["backlog"] == 0){     ?>
     leantime.helperController.showHelperModal("backlog");
     <?php
     //Only show once per session
-    $_SESSION['userdata']['appSettings']["modals"]["backlog"] = 1;
+    $_SESSION['userdata']['settings']["modals"]["backlog"] = 1;
     } ?>
 
 
diff --git a/src/domain/tickets/templates/showKanban.tpl.php b/src/domain/tickets/templates/showKanban.tpl.php
index 26ca6a332..14049eb7b 100644
--- a/src/domain/tickets/templates/showKanban.tpl.php
+++ b/src/domain/tickets/templates/showKanban.tpl.php
@@ -443,12 +443,12 @@
     var ticketStatusList = [<?php foreach($this->get('allTicketStates') as $key => $statusRow){ echo "'".$key."',"; }?>];
     leantime.ticketsController.initTicketKanban(ticketStatusList);
 
-    <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["kanban"]) === false || $_SESSION['userdata']['appSettings']["modals"]["kanban"] == 0){ ?>
+    <?php if(isset($_SESSION['userdata']['settings']["modals"]["kanban"]) === false || $_SESSION['userdata']['settings']["modals"]["kanban"] == 0){ ?>
 
         leantime.helperController.showHelperModal("kanban");
         <?php
         //Only show once per session
-        $_SESSION['userdata']['appSettings']["modals"]["kanban"] = 1;
+        $_SESSION['userdata']['settings']["modals"]["kanban"] = 1;
         }
     ?>
 
diff --git a/src/domain/timesheets/templates/showMy.tpl.php b/src/domain/timesheets/templates/showMy.tpl.php
index 9042bc543..0bdb40ef5 100644
--- a/src/domain/timesheets/templates/showMy.tpl.php
+++ b/src/domain/timesheets/templates/showMy.tpl.php
@@ -196,11 +196,11 @@
     	
     });
 
-    <?php if(isset($_SESSION['userdata']['appSettings']["modals"]["mytimesheets"]) === false || $_SESSION['userdata']['appSettings']["modals"]["mytimesheets"] == 0){     ?>
+    <?php if(isset($_SESSION['userdata']['settings']["modals"]["mytimesheets"]) === false || $_SESSION['userdata']['settings']["modals"]["mytimesheets"] == 0){     ?>
     leantime.helperController.showHelperModal("mytimesheets");
     <?php
     //Only show once per session
-    $_SESSION['userdata']['appSettings']["modals"]["mytimesheets"] = 1;
+    $_SESSION['userdata']['settings']["modals"]["mytimesheets"] = 1;
     } ?>
  });
     
diff --git a/src/domain/users/services/class.users.php b/src/domain/users/services/class.users.php
index 22382d5ac..a103f9888 100644
--- a/src/domain/users/services/class.users.php
+++ b/src/domain/users/services/class.users.php
@@ -51,11 +51,11 @@ public function updateUserSettings($category, $setting, $value)
             $filteredInput = filter_var($setting, FILTER_SANITIZE_STRING, FILTER_FLAG_ENCODE_HIGH);
             $filteredValue = filter_var($value, FILTER_SANITIZE_STRING, FILTER_FLAG_ENCODE_HIGH);
 
-            $_SESSION['userdata']['appSettings'][$category][$filteredInput] =  $filteredValue;
+            $_SESSION['userdata']['settings'][$category][$filteredInput] =  $filteredValue;
 
-            $serializeSettings = serialize($_SESSION['userdata']['appSettings']);
+            $serializeSettings = serialize($_SESSION['userdata']['settings']);
 
-            return $this->userRepo->patchUser($_SESSION['userdata']['id'], array("appSettings" => $serializeSettings));
+            return $this->userRepo->patchUser($_SESSION['userdata']['id'], array("settings" => $serializeSettings));
         }
 
     }