diff --git a/modules/users/client/controllers/userinfo/userinfo.client.controller.js b/modules/users/client/controllers/userinfo/userinfo.client.controller.js
index 03d65950..7c484914 100644
--- a/modules/users/client/controllers/userinfo/userinfo.client.controller.js
+++ b/modules/users/client/controllers/userinfo/userinfo.client.controller.js
@@ -5,9 +5,10 @@
     .module('users')
     .controller('UserInfoController', UserInfoController);
 
-  UserInfoController.$inject = ['$scope', '$state', 'Authentication', 'userResolve', 'ScoreLevelService', '$timeout', 'MeanTorrentConfig'];
+  UserInfoController.$inject = ['$scope', '$state', 'Authentication', 'userResolve', 'ScoreLevelService', '$timeout', 'MeanTorrentConfig',
+  'DebugConsoleService'];
 
-  function UserInfoController($scope, $state, Authentication, user, ScoreLevelService, $timeout, MeanTorrentConfig) {
+  function UserInfoController($scope, $state, Authentication, user, ScoreLevelService, $timeout, MeanTorrentConfig, mtDebug) {
     var vm = this;
 
     vm.authentication = Authentication;
@@ -17,6 +18,8 @@
     vm.isContextUserSelf = isContextUserSelf;
     vm.scoreLevelData = ScoreLevelService.getScoreLevelJson(vm.user.score);
 
+    mtDebug.info(user);
+
     /**
      * messageTo
      */
diff --git a/modules/users/server/controllers/admin.server.controller.js b/modules/users/server/controllers/admin.server.controller.js
index a644fb44..5e781ecf 100644
--- a/modules/users/server/controllers/admin.server.controller.js
+++ b/modules/users/server/controllers/admin.server.controller.js
@@ -349,7 +349,9 @@ exports.userByID = function (req, res, next, id) {
     });
   }
 
-  User.findById(id, '-salt -password -providerData').exec(function (err, user) {
+  User.findById(id, '-salt -password -providerData')
+    .populate('invited_by', 'username displayName profileImageURL')
+    .exec(function (err, user) {
     if (err) {
       return next(err);
     } else if (!user) {
diff --git a/modules/users/server/controllers/users/users.authentication.server.controller.js b/modules/users/server/controllers/users/users.authentication.server.controller.js
index 2bbe97cd..b439b1ee 100644
--- a/modules/users/server/controllers/users/users.authentication.server.controller.js
+++ b/modules/users/server/controllers/users/users.authentication.server.controller.js
@@ -44,6 +44,15 @@ exports.signup = function (req, res) {
       if (req.body.inviteToken) {
         Invitation.update({token: req.body.inviteToken}, {$set: {status: 2, to_user: user._id, registeredat: Date.now()}}, function (err) {
         });
+        //update user invited_by
+        Invitation.findOne({
+          token: req.body.inviteToken
+        }, function (err, inv) {
+          if (inv) {
+            user.invited_by = inv.user;
+            user.save();
+          }
+        });
       }
       // Remove sensitive data before login
       user.password = undefined;
diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
index 09880b10..f7821ded 100644
--- a/modules/users/server/models/user.server.model.js
+++ b/modules/users/server/models/user.server.model.js
@@ -184,6 +184,10 @@ var UserSchema = new Schema({
   signed_ip: [String],
   leeched_ip: [String],
   client_agent: [String],
+  invited_by: {
+    type: Schema.Types.ObjectId,
+    ref: 'User'
+  },
   created: {
     type: Date,
     default: Date.now