diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
index 743e0e3bd..1a16838ab 100644
--- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -1,6 +1,9 @@
 <?xml version='1.0' standalone='yes'?>
-<container xmlns="http://www.w3.org/1999/xhtml" xmlns:var="http://www.skyrix.com/od/binding" xmlns:const="http://www.skyrix.com/od/constant" xmlns:label="OGo:label">
-
+<container
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label">
 
     <md-content md-scroll-y="true" class="md-padding md-whiteframe-z1 bg-sogoPaper-50">
       <div class="editor md-padding">
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 35bc994b5..0f4214877 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -4,11 +4,12 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label"
-    const:userDefaultsKeys="SOGoContactsCategories"
-    const:jsFiles="Common.js, Preferences.services.js, Contacts.js, Contacts.services.js"
     className="UIxPageFrame"
-    title="name">
+    title="title"
+    const:userDefaultsKeys="SOGoContactsCategories"
+    const:jsFiles="Common.js, Preferences.services.js, Contacts.js, Contacts.services.js">
   <script type="text/javascript">
     var contactFolders = <var:string value="contactFolders" const:escapeHTML="NO" />;
   </script>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index ad8a3f567..a7ead918b 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -4,11 +4,10 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label"
     className="UIxPageFrame"
     title="title"
-    const:userDefaultsKeys="SOGoMailMessageCheck,SOGoRefreshViewCheck,SOGoMailSortByThreads,SOGoMailListViewColumnsOrder,SOGoMailDisplayRemoteInlineImages,SOGoMailComposeMessageType,SOGoMailReplyPlacement,SOGoMailLabelsColors"
-    const:userSettingsKeys="Mail"
     const:jsFiles="Common.js, Contacts.services.js, Mailer.services.js, Preferences.services.js, Mailer.js, Mailer.services.js, vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js, vendor/angular-file-upload.js">
   <script type="text/javascript">
     var mailAccounts =<var:string value="mailAccounts" const:escapeHTML="NO" />;
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 45e4f0a2b..c99ac0c2d 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -8,7 +8,6 @@
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label"
     const:jsFiles="Main.app.js, Common.js"
-    const:popup="YES"
     >
   <!--
       MAIN CONTENT ROW
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 6fa39015a..40f2cc7f2 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -4,7 +4,6 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:uix="OGo:uix"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label"
     className="UIxPageFrame"
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 1a5afa8b8..3adbe8fd5 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -1,16 +1,14 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE var:component>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:var="http://www.skyrix.com/od/binding"
-  xmlns:const="http://www.skyrix.com/od/constant"
-  xmlns:uix="OGo:uix"
-  xmlns:rsrc="OGo:url"
-  xmlns:label="OGo:label"
-  className="UIxPageFrame"
-  title="title"
-  const:userDefaultsKeys="SOGoRefreshViewCheck, SOGoCalendarCategoriesColors, SOGoDefaultCalendar, SOGoTimeFormat"
-  const:userSettingsKeys="Calendar, ShowCompletedTasks"
-  const:jsFiles="Common.js, Preferences.services.js, Contacts.services.js, Mailer.services.js, Scheduler.js, Scheduler.services.js">
+<var:component
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
+    xmlns:label="OGo:label"
+    className="UIxPageFrame"
+    title="title"
+    const:jsFiles="Common.js, Preferences.services.js, Contacts.services.js, Mailer.services.js, Scheduler.js, Scheduler.services.js">
   <script type="text/javascript">
     var firstDayOfWeek = <var:string value="firstDayOfWeek"/>;
     var dayStartHour = <var:string value="dayStartHour"/>;
@@ -176,8 +174,8 @@
               <p class="sg-item-name">{{calendar.name}}</p>
               <md-menu class="md-secondary" label:aria-label="Options">
                 <md-icon label:aria-label="Options"
-                           ng-click="$mdOpenMenu()"
-                           md-menu-origin="md-menu-origin">more_vert</md-icon>
+                         ng-click="$mdOpenMenu()"
+                         md-menu-origin="md-menu-origin">more_vert</md-icon>
                 <md-menu-content width="2">
                   <md-menu-item>
                     <md-button ng-click="calendars.confirmDelete(calendar)">
diff --git a/UI/WebServerResources/js/Common/Acl.service.js b/UI/WebServerResources/js/Common/Acl.service.js
index ee5404384..e7b4d7656 100644
--- a/UI/WebServerResources/js/Common/Acl.service.js
+++ b/UI/WebServerResources/js/Common/Acl.service.js
@@ -19,7 +19,7 @@
     angular.extend(Acl, {
       $q: $q,
       $timeout: $timeout,
-      $$resource: new Resource(Settings.activeUser.folderURL, Settings.activeUser),
+      $$resource: new Resource(Settings.activeUser('folderURL'), Settings.activeUser()),
       $User: User
     });
 
diff --git a/UI/WebServerResources/js/Common/Alarm.service.js b/UI/WebServerResources/js/Common/Alarm.service.js
index bebfbea7c..5a2cec610 100644
--- a/UI/WebServerResources/js/Common/Alarm.service.js
+++ b/UI/WebServerResources/js/Common/Alarm.service.js
@@ -129,7 +129,7 @@
   function AlarmService($timeout, Settings, Resource, $mdToast) {
     angular.extend(Alarm, {
       $timeout: $timeout,
-      $$resource: new Resource(Settings.activeUser.folderURL + 'Calendar', Settings.activeUser),
+      $$resource: new Resource(Settings.activeUser('folderURL') + 'Calendar', Settings.activeUser()),
       $toast: $mdToast
     });
 
diff --git a/UI/WebServerResources/js/Common/Common.app.js b/UI/WebServerResources/js/Common/Common.app.js
index ba507f1b7..2afa226f9 100644
--- a/UI/WebServerResources/js/Common/Common.app.js
+++ b/UI/WebServerResources/js/Common/Common.app.js
@@ -4,14 +4,22 @@
   'use strict';
 
   angular.module('SOGo.Common', ['ngMaterial'])
-    .constant('sgSettings', {
-      baseURL: ApplicationBaseURL,
-      activeUser: {
-        login: UserLogin,
-        identification: UserIdentification,
-        language: UserLanguage,
-        folderURL: UserFolderURL,
-        isSuperUser: IsSuperUser
+    .value('sgSettings', {
+      baseURL: function() {
+        return ApplicationBaseURL || null;
+      },
+      activeUser: function(param) {
+        var settings = {
+          login: UserLogin || null,
+          identification: UserIdentification || null,
+          language: UserLanguage || null,
+          folderURL: UserFolderURL || null,
+          isSuperUser: IsSuperUser || null
+        };
+        if (param)
+          return settings[param];
+        else
+          return settings;
       }
     })
 
diff --git a/UI/WebServerResources/js/Common/User.service.js b/UI/WebServerResources/js/Common/User.service.js
index 16b59302b..18d39ad67 100644
--- a/UI/WebServerResources/js/Common/User.service.js
+++ b/UI/WebServerResources/js/Common/User.service.js
@@ -21,7 +21,7 @@
     angular.extend(User, {
       $q: $q,
       $log: $log,
-      $$resource: new Resource(Settings.activeUser.folderURL, Settings.activeUser),
+      $$resource: new Resource(Settings.activeUser('folderURL'), Settings.activeUser()),
       $gravatar: Gravatar
     });
 
diff --git a/UI/WebServerResources/js/Common/navController.js b/UI/WebServerResources/js/Common/navController.js
index a4fc4b160..3254600c1 100644
--- a/UI/WebServerResources/js/Common/navController.js
+++ b/UI/WebServerResources/js/Common/navController.js
@@ -12,7 +12,7 @@
   navController.$inject =  ['$scope', '$timeout', '$interval', '$http', '$mdSidenav', '$mdBottomSheet', '$mdMedia', '$log', 'sgConstant', 'sgSettings', 'Alarm'];
   function navController($scope, $timeout, $interval, $http, $mdSidenav, $mdBottomSheet, $mdMedia, $log, sgConstant, sgSettings, Alarm) {
 
-    $scope.activeUser = sgSettings.activeUser;
+    $scope.activeUser = sgSettings.activeUser();
 
     // Show current day in top bar
     $scope.currentDay = window.currentDay;
@@ -23,7 +23,7 @@
           $scope.currentDay = data;
         });
       }, 24 * 3600 * 1000);
-    }, window.secondsBeforeTomorrow * 1000);
+    }, window.currentDay.secondsBeforeTomorrow * 1000);
 
     $scope.toggleLeft = function () {
       $mdSidenav('left').toggle()
diff --git a/UI/WebServerResources/js/Contacts.app.js b/UI/WebServerResources/js/Contacts.app.js
index d3e7d8f5b..ac25c4f98 100644
--- a/UI/WebServerResources/js/Contacts.app.js
+++ b/UI/WebServerResources/js/Contacts.app.js
@@ -5,19 +5,8 @@
   'use strict';
 
   angular.module('SOGo.ContactsUI', ['ngSanitize', 'ui.router', 'SOGo.Common', 'SOGo.PreferencesUI'])
-
-    .constant('sgSettings', {
-      baseURL: ApplicationBaseURL,
-      activeUser: {
-        login: UserLogin,
-        identification: UserIdentification,
-        language: UserLanguage,
-        folderURL: UserFolderURL,
-        isSuperUser: IsSuperUser
-      }
-    })
-
-    .config(configure);
+    .config(configure)
+    .run(runBlock);
 
   /**
    * @ngInject
@@ -138,4 +127,14 @@
     return stateAddressbook.$getCard($stateParams.cardId);
   }
 
+  /**
+   * @ngInject
+   */
+  runBlock.$inject = ['$rootScope'];
+  function runBlock($rootScope) {
+    $rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {
+      console.error(event, current, previous, rejection);
+    });
+  }
+
 })();
diff --git a/UI/WebServerResources/js/Contacts/AddressBook.service.js b/UI/WebServerResources/js/Contacts/AddressBook.service.js
index 926375109..81ed3c0f6 100644
--- a/UI/WebServerResources/js/Contacts/AddressBook.service.js
+++ b/UI/WebServerResources/js/Contacts/AddressBook.service.js
@@ -37,7 +37,7 @@
       $q: $q,
       $timeout: $timeout,
       $log: $log,
-      $$resource: new Resource(Settings.activeUser.folderURL + 'Contacts', Settings.activeUser),
+      $$resource: new Resource(Settings.activeUser('folderURL') + 'Contacts', Settings.activeUser()),
       $Card: Card,
       $$Acl: Acl,
       $Preferences: Preferences,
diff --git a/UI/WebServerResources/js/Contacts/Card.service.js b/UI/WebServerResources/js/Contacts/Card.service.js
index 108b99373..130891c11 100644
--- a/UI/WebServerResources/js/Contacts/Card.service.js
+++ b/UI/WebServerResources/js/Contacts/Card.service.js
@@ -38,12 +38,17 @@
    * @desc The factory we'll use to register with Angular.
    * @returns the Card constructor
    */
-  Card.$factory = ['$timeout', 'sgSettings', 'Resource', 'Gravatar', function($timeout, Settings, Resource, Gravatar) {
+  Card.$factory = ['$timeout', 'sgSettings', 'Resource', 'Preferences', 'Gravatar', function($timeout, Settings, Resource, Preferences, Gravatar) {
     angular.extend(Card, {
-      $$resource: new Resource(Settings.activeUser.folderURL + 'Contacts', Settings.activeUser),
+      $$resource: new Resource(Settings.activeUser('folderURL') + 'Contacts', Settings.activeUser()),
       $timeout: $timeout,
-      $gravatar: Gravatar,
-      $categories: window.UserDefaults.SOGoContactsCategories
+      $gravatar: Gravatar
+    });
+    // Initialize categories from user's defaults
+    Preferences.ready().then(function() {
+      if (Preferences.defaults.SOGoContactsCategories) {
+        Card.$categories = Preferences.defaults.SOGoContactsCategories;
+      }
     });
 
     return Card; // return constructor
diff --git a/UI/WebServerResources/js/Mailer/Account.service.js b/UI/WebServerResources/js/Mailer/Account.service.js
index af8b5ec8b..c3405101f 100644
--- a/UI/WebServerResources/js/Mailer/Account.service.js
+++ b/UI/WebServerResources/js/Mailer/Account.service.js
@@ -36,7 +36,7 @@
       $q: $q,
       $timeout: $timeout,
       $log: $log,
-      $$resource: new Resource(Settings.baseURL, Settings.activeUser),
+      $$resource: new Resource(Settings.baseURL(), Settings.activeUser()),
       $Mailbox: Mailbox,
       $Message: Message
     });
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index 1223a6ab0..5fa3d3818 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -36,7 +36,7 @@
       $q: $q,
       $timeout: $timeout,
       $log: $log,
-      $$resource: new Resource(Settings.activeUser.folderURL + 'Mail', Settings.activeUser),
+      $$resource: new Resource(Settings.activeUser('folderURL') + 'Mail', Settings.activeUser()),
       $Message: Message,
       $$Acl: Acl,
       $Preferences: Preferences,
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 0bc923c6b..1838fdf06 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -35,18 +35,20 @@
    * @desc The factory we'll use to register with Angular
    * @returns the Message constructor
    */
-  Message.$factory = ['$q', '$timeout', '$log', '$sce', 'sgSettings', 'Resource', function($q, $timeout, $log, $sce, Settings, Resource) {
+  Message.$factory = ['$q', '$timeout', '$log', '$sce', 'sgSettings', 'Resource', 'Preferences', function($q, $timeout, $log, $sce, Settings, Resource, Preferences) {
     angular.extend(Message, {
       $q: $q,
       $timeout: $timeout,
       $log: $log,
       $sce: $sce,
-      $$resource: new Resource(Settings.activeUser.folderURL + 'Mail', Settings.activeUser)
+      $$resource: new Resource(Settings.activeUser('folderURL') + 'Mail', Settings.activeUser())
+    });
+    // Initialize tags form user's defaults
+    Preferences.ready().then(function() {
+      if (Preferences.defaults.SOGoMailLabelsColors) {
+        Message.$tags = Preferences.defaults.SOGoMailLabelsColors;
+      }
     });
-
-    if (window.UserDefaults && window.UserDefaults.SOGoMailLabelsColors) {
-      Message.$tags = window.UserDefaults.SOGoMailLabelsColors;
-    }
 
     return Message; // return constructor
   }];
diff --git a/UI/WebServerResources/js/Preferences.app.js b/UI/WebServerResources/js/Preferences.app.js
index 02804db05..168b745d3 100644
--- a/UI/WebServerResources/js/Preferences.app.js
+++ b/UI/WebServerResources/js/Preferences.app.js
@@ -4,22 +4,9 @@
 (function() {
   'use strict';
 
-  angular.module('SOGo.ContactsUI', []);
-  angular.module('SOGo.MailerUI', []);
-
   angular.module('SOGo.PreferencesUI', ['ngSanitize', 'ui.router', 'SOGo.Common', 'SOGo.MailerUI', 'SOGo.ContactsUI', 'SOGo.Authentication'])
-
-    .constant('sgSettings', {
-      baseURL: ApplicationBaseURL,
-      activeUser: {
-        login: UserLogin,
-        identification: UserIdentification,
-        language: UserLanguage,
-        folderURL: UserFolderURL,
-        isSuperUser: IsSuperUser
-      }
-    })
-    .config(configure);
+    .config(configure)
+    .run(runBlock);
 
   /**
    * @ngInject
@@ -84,5 +71,15 @@
   function statePreferences(Preferences) {
     return Preferences;
   }
-  
+
+  /**
+   * @ngInject
+   */
+  runBlock.$inject = ['$rootScope'];
+  function runBlock($rootScope) {
+    $rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {
+      console.error(event, current, previous, rejection);
+    });
+  }
+
 })();
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index d2a6e7a6e..82d9b65b6 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -61,7 +61,7 @@
       $q: $q,
       $timeout: $timeout,
       $log: $log,
-      $$resource: new Resource(Settings.activeUser.folderURL, Settings.activeUser),
+      $$resource: new Resource(Settings.activeUser('folderURL'), Settings.activeUser()),
       activeUser: Settings.activeUser,
       $User: User
     });
diff --git a/UI/WebServerResources/js/Scheduler/Calendar.service.js b/UI/WebServerResources/js/Scheduler/Calendar.service.js
index 46476619e..d80670094 100644
--- a/UI/WebServerResources/js/Scheduler/Calendar.service.js
+++ b/UI/WebServerResources/js/Scheduler/Calendar.service.js
@@ -31,7 +31,7 @@
       $q: $q,
       $timeout: $timeout,
       $log: $log,
-      $$resource: new Resource(Settings.activeUser.folderURL + 'Calendar', Settings.activeUser),
+      $$resource: new Resource(Settings.activeUser('folderURL') + 'Calendar', Settings.activeUser()),
       $Component: Component,
       $$Acl: Acl,
       activeUser: Settings.activeUser
diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js
index e69b2f586..4ab2721d5 100644
--- a/UI/WebServerResources/js/Scheduler/Component.service.js
+++ b/UI/WebServerResources/js/Scheduler/Component.service.js
@@ -38,24 +38,26 @@
       $log: $log,
       $Preferences: Preferences,
       $gravatar: Gravatar,
-      $$resource: new Resource(Settings.baseURL, Settings.activeUser),
-      $categories: window.UserDefaults.SOGoCalendarCategoriesColors,
+      $$resource: new Resource(Settings.baseURL(), Settings.activeUser()),
+      timeFormat: "%H:%M",
       // Filter parameters common to events and tasks
       $query: { value: '', search: 'title_Category_Location' },
       // Filter paramaters specific to events
       $queryEvents: { sort: 'start', asc: 1, filterpopup: 'view_next7' },
       // Filter parameters specific to tasks
-      $queryTasks: { sort: 'status', asc: 1, filterpopup: 'view_incomplete' }
+      $queryTasks: { sort: 'status', asc: 1, filterpopup: 'view_next7' } //'view_incomplete' }
     });
-    // Initialize filter parameters from user's settings
     Preferences.ready().then(function() {
+      // Initialize filter parameters from user's settings
       Component.$queryEvents.filterpopup = Preferences.settings.CalendarDefaultFilter;
       Component.$queryTasks.show_completed = parseInt(Preferences.settings.ShowCompletedTasks);
+      // Initialize categories from user's defaults
+      Component.$categories = Preferences.defaults.SOGoCalendarCategoriesColors;
+      // Initialize time format from user's defaults
+      if (Preferences.defaults.SOGoTimeFormat) {
+        Component.timeFormat = Preferences.defaults.SOGoTimeFormat;
+      }
     });
-    if (window.UserDefaults && window.UserDefaults.SOGoTimeFormat)
-      Component.timeFormat = window.UserDefaults.SOGoTimeFormat;
-    else
-      Component.timeFormat = "%H:%M";
 
     return Component; // return constructor
   }];