diff --git a/UI/WebServerResources/js/Administration/AdministrationController.js b/UI/WebServerResources/js/Administration/AdministrationController.js
index 8de6a7251..18e9df959 100644
--- a/UI/WebServerResources/js/Administration/AdministrationController.js
+++ b/UI/WebServerResources/js/Administration/AdministrationController.js
@@ -7,46 +7,44 @@
   /**
    * @ngInject
    */
-  AdministrationController.$inject = ['$state', '$mdToast', '$mdMedia', '$mdSidenav', 'sgConstant', 'Dialog', 'encodeUriFilter', 'User'];
-  function AdministrationController($state, $mdToast, $mdMedia, $mdSidenav, sgConstant, Dialog, encodeUriFilter, User) {
-    var vm = this;
+  AdministrationController.$inject = ['$state', '$window', '$mdToast', '$mdMedia', '$mdSidenav', 'sgConstant', 'Dialog', 'encodeUriFilter', 'User'];
+  function AdministrationController($state, $window, $mdToast, $mdMedia, $mdSidenav, sgConstant, Dialog, encodeUriFilter, User) {
+    var vm = this,
+        defaultWindowTitle = angular.element($window.document).find('title').attr('sg-default') || "SOGo";
 
-    vm.service = User;
+    this.$onInit = function() {
+      this.service = User;
 
-    vm.selectedUser = null;
-    vm.users = User.$users;
+      this.selectedUser = null;
+      this.users = User.$users;
+    };
 
-    vm.go = go;
-    vm.filter = filter;
-    vm.selectUser = selectUser;
-    vm.selectFolder = selectFolder;
-
-    function go(module) {
+    this.go = function (module) {
       $state.go('administration.' + module);
       // Close sidenav on small devices
       if (!$mdMedia(sgConstant['gt-md']))
         $mdSidenav('left').close();
-    }
+    };
 
-    function filter(searchText) {
+    this.filter = function (searchText) {
       User.$filter(searchText);
-    }
+    };
 
-    function selectUser(i) {
-      if (vm.selectedUser == vm.users[i]) {
-        vm.selectedUser = null;
+    this.selectUser = function (i) {
+      if (this.selectedUser == this.users[i]) {
+        this.selectedUser = null;
       }
       else {
         // Fetch folders of specific type for selected user
-        vm.users[i].$folders().then(function() {
+        this.users[i].$folders().then(function() {
           vm.selectedUser = vm.users[i];
         });
       }
-    }
+    };
 
-    function selectFolder(folder) {
-      $state.go('administration.rights.edit', {userId: vm.selectedUser.uid, folderId: encodeUriFilter(folder.name)});
-    }
+    this.selectFolder = function (folder) {
+      $state.go('administration.rights.edit', {userId: this.selectedUser.uid, folderId: encodeUriFilter(folder.name)});
+    };
 
   }
 
diff --git a/UI/WebServerResources/js/Common/sgSearch.directive.js b/UI/WebServerResources/js/Common/sgSearch.directive.js
index 5b3c6bb5e..3aaaf8ea1 100644
--- a/UI/WebServerResources/js/Common/sgSearch.directive.js
+++ b/UI/WebServerResources/js/Common/sgSearch.directive.js
@@ -135,18 +135,18 @@
     }
 
     // Method to call on data changes
-    vm.onChange = function() {
-      var form = $scope[vm.formName],
-          input = form[vm.inputName],
+    this.onChange = function() {
+      var form = $scope[this.formName],
+          input = form[this.inputName],
           rawSearchText = input.$viewValue;
 
-      if (vm.allowDot && rawSearchText == '.' || form.$valid && rawSearchText) {
+      if (this.allowDot && rawSearchText == '.' || form.$valid && rawSearchText) {
         if (rawSearchText == '.')
           // Ignore the minlength constraint when using the dot operator
           input.$setValidity('minlength', true);
 
         // doSearch is the compiled expression of the sg-search attribute
-        vm.doSearch($scope, { searchText: rawSearchText, searchField: vm.searchField });
+        this.doSearch($scope, { searchText: rawSearchText, searchField: this.searchField });
       }
     };