diff --git a/Disco.Services/Devices/Importing/Fields/AssignedUserIdImportField.cs b/Disco.Services/Devices/Importing/Fields/AssignedUserIdImportField.cs
index 593ee5b2..0d6743ef 100644
--- a/Disco.Services/Devices/Importing/Fields/AssignedUserIdImportField.cs
+++ b/Disco.Services/Devices/Importing/Fields/AssignedUserIdImportField.cs
@@ -119,16 +119,23 @@ namespace Disco.Services.Devices.Importing.Fields
                 // Add Assignment
                 if (parsedValue != null)
                 {
+                    var user = Database.Users.FirstOrDefault(u => u.UserId == parsedValue);
                     var assignment = new DeviceUserAssignment()
                     {
                         Device = Device,
                         DeviceSerialNumber = Device.SerialNumber,
-                        AssignedUserId = parsedValue,
+                        AssignedUserId = user.UserId,
+                        AssignedUser = user,
                         AssignedDate = DateTime.Now
                     };
                     Database.DeviceUserAssignments.Add(assignment);
+                    Device.AssignedUser = user;
+                    Device.AssignedUserId = user.UserId;
+                }
+                else
+                {
+                    Device.AssignedUserId = null;
                 }
-                Device.AssignedUserId = parsedValue;
 
                 return true;
             }