diff --git a/front-end/meteor-device-spy/client/client.js b/front-end/meteor-device-spy/client/client.js
index 5f03a4d..4999756 100644
--- a/front-end/meteor-device-spy/client/client.js
+++ b/front-end/meteor-device-spy/client/client.js
@@ -8,7 +8,7 @@ Template.devices_list.device = function () {
 Template.devices_list.get_name_by_id = function () {
   var owner = Users.findOne({_id: this.owner_id});
   if (!owner) return "Не известно";
-  return owner.name + " " + owner.surname;
+  return this.owner_name + " " + this.owner_surname;
 };
 
 Template.devices_list.get_checkin_date = function () {
diff --git a/front-end/meteor-device-spy/server/checkindevice_api.js b/front-end/meteor-device-spy/server/checkindevice_api.js
index 768f4d3..83b475e 100644
--- a/front-end/meteor-device-spy/server/checkindevice_api.js
+++ b/front-end/meteor-device-spy/server/checkindevice_api.js
@@ -17,7 +17,10 @@ Meteor.startup(function () {
 
     console.log("-------- Устройство: ", device.name);
 
-    Devices.update(device._id, {$set: {checkin_date: new Date(), owner_id: user._id}});
+    Devices.update(device._id, {$set: {checkin_date: new Date(), 
+      owner_id: user._id, 
+      owner_name: user.name, 
+      owner_surname: user.surname}});
   });
 
 });