diff --git a/api/types/device.go b/api/types/device.go
index acf19714ecea7..1aa8be246532a 100644
--- a/api/types/device.go
+++ b/api/types/device.go
@@ -141,6 +141,7 @@ func DeviceFromResource(res *DeviceV1) (*devicepb.Device, error) {
 			OsVersion:               d.OsVersion,
 			OsBuild:                 d.OsBuild,
 			OsUsername:              d.OsUsername,
+			OsLoginUser:             d.OsLoginUser,
 			JamfBinaryVersion:       d.JamfBinaryVersion,
 			MacosEnrollmentProfiles: d.MacosEnrollmentProfiles,
 			ReportedAssetTag:        d.ReportedAssetTag,
@@ -235,6 +236,7 @@ func DeviceToResource(dev *devicepb.Device) *DeviceV1 {
 			OsVersion:               d.OsVersion,
 			OsBuild:                 d.OsBuild,
 			OsUsername:              d.OsUsername,
+			OsLoginUser:             d.OsLoginUser,
 			JamfBinaryVersion:       d.JamfBinaryVersion,
 			MacosEnrollmentProfiles: d.MacosEnrollmentProfiles,
 			ReportedAssetTag:        d.ReportedAssetTag,
diff --git a/api/types/device_test.go b/api/types/device_test.go
index 9c02326ff722c..3a077ae1d262e 100644
--- a/api/types/device_test.go
+++ b/api/types/device_test.go
@@ -67,6 +67,7 @@ func TestDeviceConversions_toAndFrom(t *testing.T) {
 				OsVersion:               "13.1.2",
 				OsBuild:                 "22D68",
 				OsUsername:              "llama",
+				OsLoginUser:             "llama2", // Usually matches OsUsername, different for testing only
 				JamfBinaryVersion:       "9.27",
 				MacosEnrollmentProfiles: "Enrolled via DEP: No\nMDM enrollment: Yes (User Approved)\nMDM server: ...",
 				ReportedAssetTag:        assetTag + "-reported",
diff --git a/lib/devicetrust/native/device_darwin.go b/lib/devicetrust/native/device_darwin.go
index 9167b567aec9a..019f22b34967e 100644
--- a/lib/devicetrust/native/device_darwin.go
+++ b/lib/devicetrust/native/device_darwin.go
@@ -156,6 +156,7 @@ func collectDeviceData(_ CollectDataMode) (*devicepb.DeviceCollectedData, error)
 		OsVersion:               fmt.Sprintf("%v.%v.%v", dd.os_major, dd.os_minor, dd.os_patch),
 		OsBuild:                 osBuild,
 		OsUsername:              osUser.Username,
+		OsLoginUser:             osUser.Username,
 		JamfBinaryVersion:       jamfVersion,
 		MacosEnrollmentProfiles: macosEnrollmentProfiles,
 		SystemSerialNumber:      sn,
diff --git a/lib/devicetrust/native/device_linux.go b/lib/devicetrust/native/device_linux.go
index 25e550576d3ec..ad56a6f0075af 100644
--- a/lib/devicetrust/native/device_linux.go
+++ b/lib/devicetrust/native/device_linux.go
@@ -185,6 +185,7 @@ func collectDeviceData(mode CollectDataMode) (*devicepb.DeviceCollectedData, err
 		OsVersion:             osRelease.VersionID,
 		OsBuild:               osRelease.Version,
 		OsUsername:            displayName, // Wrong, but kept for backwards compatibility.
+		OsLoginUser:           u.Username,
 		ReportedAssetTag:      reportedAssetTag,
 		SystemSerialNumber:    systemSerialNumber,
 		BaseBoardSerialNumber: baseBoardSerialNumber,
diff --git a/lib/devicetrust/native/device_linux_test.go b/lib/devicetrust/native/device_linux_test.go
index 6f1f545437ccb..b02301ba4d85b 100644
--- a/lib/devicetrust/native/device_linux_test.go
+++ b/lib/devicetrust/native/device_linux_test.go
@@ -60,6 +60,7 @@ func TestCollectDeviceData_linux(t *testing.T) {
 		OsVersion:             "22.04",
 		OsBuild:               "22.04.3 LTS (Jammy Jellyfish)",
 		OsUsername:            u.Name,
+		OsLoginUser:           u.Username,
 		ReportedAssetTag:      "No Asset Information",
 		SystemSerialNumber:    "PF0A0AAA",
 		BaseBoardSerialNumber: "L1AA00A00A0",
diff --git a/lib/devicetrust/native/device_windows.go b/lib/devicetrust/native/device_windows.go
index a9b3858a46d92..090612922798f 100644
--- a/lib/devicetrust/native/device_windows.go
+++ b/lib/devicetrust/native/device_windows.go
@@ -220,6 +220,7 @@ func collectDeviceData(_ CollectDataMode) (*devicepb.DeviceCollectedData, error)
 		OsVersion:             fmt.Sprintf("%v.%v.%v", ver.MajorVersion, ver.MinorVersion, ver.BuildNumber),
 		OsBuild:               strconv.FormatInt(int64(ver.BuildNumber), 10),
 		OsUsername:            u.Username,
+		OsLoginUser:           u.Username,
 		SystemSerialNumber:    systemSerial,
 		BaseBoardSerialNumber: baseBoardSerial,
 		ReportedAssetTag:      reportedAssetTag,