1 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.Common.Implementations/Security/UsageReporter.cs b/MediaBrowser.Common.Implementations/Security/UsageReporter.cs
index 89ca0a0e4..a06351be2 100644
--- a/MediaBrowser.Common.Implementations/Security/UsageReporter.cs
+++ b/MediaBrowser.Common.Implementations/Security/UsageReporter.cs
@@ -30,6 +30,7 @@ namespace MediaBrowser.Common.Implementations.Security
             {
                 { "feature", _applicationHost.Name }, 
                 { "mac", mac }, 
+                { "systemid", _applicationHost.SystemId }, 
                 { "ver", _applicationHost.ApplicationVersion.ToString() }, 
                 { "platform", Environment.OSVersion.VersionString }, 
                 { "isservice", _applicationHost.IsRunningAsService.ToString().ToLower()}
@@ -40,12 +41,18 @@ namespace MediaBrowser.Common.Implementations.Security
 
         public Task ReportAppUsage(ClientInfo app, CancellationToken cancellationToken)
         {
+            if (string.IsNullOrWhiteSpace(app.DeviceId))
+            {
+                throw new ArgumentException("Client info must have a device Id");
+            }
+
             cancellationToken.ThrowIfCancellationRequested();
 
             var data = new Dictionary<string, string>
             {
                 { "feature", app.AppName ?? "Unknown App" }, 
-                { "mac", app.DeviceId ?? _networkManager.GetMacAddress() }, 
+                { "systemid", _applicationHost.SystemId }, 
+                { "mac", app.DeviceId }, 
                 { "ver", app.AppVersion ?? "Unknown" }, 
                 { "platform", app.DeviceName }, 
             };