diff --git a/applications/subscriberPortal/bs-config.js b/applications/subscriberPortal/bs-config.js
index 6888103..4acb4c6 100644
--- a/applications/subscriberPortal/bs-config.js
+++ b/applications/subscriberPortal/bs-config.js
@@ -51,10 +51,9 @@
         req.url.indexOf('/xoslib/') !== -1 ||
         req.url.indexOf('/hpcapi/') !== -1
       ){
-        //if(conf.xoscsrftoken && conf.xossessionid){
-        //  req.headers.cookie = `xoscsrftoken=${conf.xoscsrftoken}; xossessionid=${conf.xossessionid}`;
-        //  req.headers['x-csrftoken'] = conf.xoscsrftoken;
-        //}
+        if(req.headers['X-CSRFToken']){
+          req.headers['x-csrftoken'] = req.headers['x-csrftoken'];
+        }
         proxy.web(req, res);
       }
       else{
diff --git a/applications/subscriberPortal/src/app/fw/services/rest.js b/applications/subscriberPortal/src/app/fw/services/rest.js
index 45ec41b..db35617 100644
--- a/applications/subscriberPortal/src/app/fw/services/rest.js
+++ b/applications/subscriberPortal/src/app/fw/services/rest.js
@@ -18,15 +18,29 @@
   "use strict";
 
   angular.module('cordRest', [])
+  .factory('SetCSRFToken', function setCSRFToken($cookies) {
+    return {
+      request: function(request){
+        request.headers['X-CSRFToken'] = $cookies.get('xoscsrftoken');
+        return request;
+      }
+    };
+  })
   .service('User', function($http, $q, $cookies, cordConfig){
     this.login = function(username, password){
       var deferred = $q.defer();
+      var user;
 
+      // logging in the user
       $http.post(cordConfig.url + '/xoslib/login/', {username: username, password: password})
       .then(function(res){
         $cookies.put('user', res.data.user);
         $cookies.put('sessionid', res.data.xossessionid);
-        deferred.resolve(JSON.parse(res.data.user));
+        user = JSON.parse(res.data.user);
+        return $http.get(cordConfig.url + '/xos/tenantrootprivileges?user=' + user.id);
+      }).then(function(subscriber){
+          console.log(subscriber);
+          deferred.resolve(user);
       })
       .catch(function(e){
         throw new Error(e);
@@ -65,14 +79,14 @@
     return $resource(cordConfig.url + '/xoslib/rs/subscriber/:subscriberId/users/:id', {}, {
       query: {
         method: 'GET',
-        isArray: false,
+        isArray: true,
         interceptor: {
           response: function(res){
             // this is used to fake some data that are not XOS related,
             // but can be provided by any external services
 
             // add an icon to the user
-            res.data.users.map(function(user){
+            res.data.map(function(user){
               switch (user.name){
                 case 'Mom\'s PC':
                   user['icon_id'] = 'mom';
@@ -92,7 +106,7 @@
             });
 
             // add a random login date to the user
-            res.data.users.forEach(function(user){
+            res.data.forEach(function(user){
               if(!angular.isDefined(cordConfig.userActivity[user.id])){
                 var date = Helpers.randomDate(new Date(2015, 0, 1), new Date());
                 cordConfig.userActivity[user.id] = $filter('date')(date, 'mediumTime');
diff --git a/applications/subscriberPortal/src/app/view/home/home.js b/applications/subscriberPortal/src/app/view/home/home.js
index ea35436..bc59efb 100644
--- a/applications/subscriberPortal/src/app/view/home/home.js
+++ b/applications/subscriberPortal/src/app/view/home/home.js
@@ -27,7 +27,7 @@
       .then(function(res){
         $scope.bundle_name = cordConfig.bundles[cordConfig.activeBundle].name;
         $scope.bundle_desc = cordConfig.bundles[cordConfig.activeBundle].desc;
-        $scope.users = res.users;
+        $scope.users = res;
       })
       .catch(function(){
         $log.error('Problem with resource', SubscriberUsers);
diff --git a/applications/subscriberPortal/src/app/view/user/user.js b/applications/subscriberPortal/src/app/view/user/user.js
index 579cac7..d1ab838 100644
--- a/applications/subscriberPortal/src/app/view/user/user.js
+++ b/applications/subscriberPortal/src/app/view/user/user.js
@@ -38,8 +38,7 @@
               }
             });
           }
-
-          $scope.users = res.users;
+          $scope.users = res;
         })
         .catch(function () {
           $log.error('Problem with resource', SubscriberUsers);