Allow null user on jobs.

Dropped use of any user on PPC.

15 files changed, 95 insertions, 71 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 8f02749da..fc0680d9c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1257,7 +1257,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 ||
                 j.Name.ToLower().Contains(filter) //Job name
                 ||
-                j.User.Contact.FirstName.ToLower().Contains(filter) // User first name
+                (j.User != null && j.User.Contact.FirstName.ToLower().Contains(filter)) // User first name
                 ||
                 j.Length.ToString().Contains(filter); //Job length
             };
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index 78a7551c0..c7e1d4130 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -193,7 +193,7 @@
                                         <DataGridTemplateColumn Header="CREATED BY" Width="100" CanUserSort="True" SortMemberPath="User.Contact.FirstName">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <TextBlock Text="{Binding User.Contact.FirstName}" VerticalAlignment="Center" FontSize="14"></TextBlock>
+                                                    <TextBlock Text="{Binding User.Contact.FirstName,TargetNullValue='N/A',FallbackValue='N/A'}" VerticalAlignment="Center" FontSize="14"></TextBlock>
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
index de506bab8..862f48793 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
@@ -493,7 +493,7 @@
                 </DataGridTemplateColumn>
                 <DataGridTextColumn Header="ID" Binding="{Binding JobRun.ID}" Width="50" ElementStyle="{StaticResource WrapText}"/>
                 <DataGridTextColumn Header="Machine" Binding="{Binding Machine.SerialNumber}" Width="100" ></DataGridTextColumn>
-                <DataGridTextColumn Header="User" Binding="{Binding User.Contact.FullName}" Width="100" ElementStyle="{StaticResource WrapText}" />
+                <DataGridTextColumn Header="User" Binding="{Binding User.Contact.FullName,TargetNullValue='N/A',FallbackValue='N/A'}" Width="100" ElementStyle="{StaticResource WrapText}" />
                 <DataGridTextColumn Header="Job Name" Binding="{Binding JobRun.JobName}" Width="100" ElementStyle="{StaticResource WrapText}"/>
                 <DataGridTextColumn Header="Thread" Binding="{Binding Rml.Name}" Width="80" ElementStyle="{StaticResource WrapText}"/>
                 <DataGridTextColumn Header="Length" Binding="{Binding JobRun.JobLength, StringFormat={}{0:0.00}}" Width="60" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index c41a9ef5d..164867afe 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -518,7 +518,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 job.ColorSpaceGuid = Adapter.ColorSpaces.FirstOrDefault(x => x.Code == vm.SelectedColorSpace.ToInt32()).Guid;
                 job.ColorSpace = _colorSpaces.SingleOrDefault(x => x.Guid == job.ColorSpaceGuid);
                 job.MachineGuid = MachineProvider.Machine.Guid;
-                job.UserGuid = AuthenticationProvider.CurrentUser.Guid;
+                job.UserGuid = null;
                 job.RmlGuid = Settings.DefaultRmlGuid != null ? Settings.DefaultRmlGuid : _rmls.FirstOrDefault().Guid;
                 job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid;
                 job.SpoolTypeGuid = Settings.DefaultSpoolTypeGuid != null ? Settings.DefaultSpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
@@ -843,7 +843,7 @@ namespace Tango.PPC.Jobs.ViewModels
                         try
                         {
                             JobFile jFile = JobFile.Parser.ParseFrom(File.ReadAllBytes(jobFile.Path));
-                            var job = await Job.FromJobFile(jFile, MachineProvider.Machine.Guid, AuthenticationProvider.CurrentUser.Guid);
+                            var job = await Job.FromJobFile(jFile, MachineProvider.Machine.Guid, null);
                             job.JobSource = JobSource.Local;
                             jobContext.Jobs.Add(job);
                             await jobContext.SaveChangesAsync();
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Authentication/IAuthenticationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Authentication/IAuthenticationProvider.cs
index 33761c8d6..ca927e6df 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Authentication/IAuthenticationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Authentication/IAuthenticationProvider.cs
@@ -23,6 +23,11 @@ namespace Tango.PPC.Common.Authentication
         User CurrentUser { get; }
 
         /// <summary>
+        /// Gets a value indicating whether the authentication provider is using a null user.
+        /// </summary>
+        bool AuthenticationRequired { get; }
+
+        /// <summary>
         /// Performs a user login by the specified email and password.
         /// </summary>
         /// <param name="email">The email.</param>
@@ -32,6 +37,12 @@ namespace Tango.PPC.Common.Authentication
         Task<User> Login(String email, String password, bool encrypt = true);
 
         /// <summary>
+        /// Performs a fake login when no authentication is used.
+        /// </summary>
+        /// <returns></returns>
+        Task Login();
+
+        /// <summary>
         /// Logs-out the current logged-in user.
         /// </summary>
         void LogOut();
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/BackupRestore/DefaultBackupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/BackupRestore/DefaultBackupManager.cs
index 087534d48..d32df734d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/BackupRestore/DefaultBackupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/BackupRestore/DefaultBackupManager.cs
@@ -368,7 +368,7 @@ namespace Tango.PPC.Common.BackupRestore
                                             {
                                                 LogManager.Log("Job already exist, overwriting...");
 
-                                                var newJob = Job.FromJobFile(jobFile, _machineProvider.Machine.Guid, _authenticationProvider.CurrentUser.Guid).Result;
+                                                var newJob = Job.FromJobFile(jobFile, _machineProvider.Machine.Guid, null).Result;
                                                 newJob.Guid = existingJob.Guid;
 
                                                 existingJob.Delete(db);
@@ -386,7 +386,7 @@ namespace Tango.PPC.Common.BackupRestore
                                     }
                                     else
                                     {
-                                        var newJob = Job.FromJobFile(jobFile, _machineProvider.Machine.Guid, _authenticationProvider.CurrentUser.Guid).Result;
+                                        var newJob = Job.FromJobFile(jobFile, _machineProvider.Machine.Guid, null).Result;
                                         db.Jobs.Add(newJob);
                                     }
                                 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs
index 970532d43..e9bcd4246 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs
@@ -261,7 +261,7 @@ namespace Tango.PPC.Common.EventLogging
             machineEvent.HostName = _hostName;
             machineEvent.EventType = _eventTypesGuids[machineEvent.Type];
 
-            if (_machine == null || _authentication.CurrentUser == null)
+            if (_machine == null)
             {
                 _pendingEvents.Add(machineEvent);
             }
@@ -280,8 +280,8 @@ namespace Tango.PPC.Common.EventLogging
 
                 LogManager.Log("Logging event " + machineEvent.EventType.Name);
                 machineEvent.MachineGuid = _machine.Guid;
-                machineEvent.UserGuid = _authentication.CurrentUser.Guid;
-                machineEvent.User = _authentication.CurrentUser;
+                machineEvent.UserGuid = null;
+                machineEvent.User = null;
                 _events.Enqueue(machineEvent);
 
                 if (!_currentEvents.Exists(x => x.Type == machineEvent.Type))
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
index 53e41062f..ab1f8e890 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
@@ -315,7 +315,7 @@ namespace Tango.PPC.Common.Synchronization
                         var job = dto.ToObservable();
 
                         job.ID = 0;
-                        job.UserGuid = _authenticationProvider.CurrentUser.Guid;
+                        job.UserGuid = null;
                         job.CustomerGuid = null;
                         job.IsSynchronized = true;
 
@@ -385,7 +385,7 @@ namespace Tango.PPC.Common.Synchronization
                     {
                         var ev = dto.ToObservable();
                         ev.ID = 0;
-                        ev.UserGuid = _authenticationProvider.CurrentUser.Guid;
+                        ev.UserGuid = null;
                         ev.IsSynchronized = true;
 
                         if (await db.MachinesEvents.SingleOrDefaultAsync(x => x.Guid == ev.Guid) == null)
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index 14666f16a..87b322f04 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -489,7 +489,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
index 04e968da2..e7be61b0a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -46,6 +46,11 @@ namespace Tango.PPC.UI.Authentication
         }
 
         /// <summary>
+        /// Gets a value indicating whether the authentication provider is using a null user.
+        /// </summary>
+        public bool AuthenticationRequired { get; private set; }
+
+        /// <summary>
         /// Performs a user login by the specified email and password.
         /// </summary>
         /// <param name="email">The email.</param>
@@ -56,6 +61,9 @@ namespace Tango.PPC.UI.Authentication
         {
             return Task.Factory.StartNew<User>(() =>
             {
+
+                AuthenticationRequired = true;
+
                 String hash = encrypt ? User.GetPasswordHash(password) : password;
 
                 LogManager.Log($"Logging in user {email}...");
@@ -82,6 +90,16 @@ namespace Tango.PPC.UI.Authentication
             });
         }
 
+        public Task Login()
+        {
+            return Task.Factory.StartNew(() => 
+            {
+                AuthenticationRequired = false;
+                CurrentUser = null;
+                CurrentUserChanged?.Invoke(this, CurrentUser);
+            });
+        }
+
         /// <summary>
         /// Logs-out the current logged-in user.
         /// </summary>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs
index 375b648d0..bbabed225 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs
@@ -131,10 +131,14 @@ namespace Tango.PPC.UI.Modules
 
             UserModules.Clear();
 
-            if (_authenticationProvider.CurrentUser != null)
+            if (_authenticationProvider.AuthenticationRequired && _authenticationProvider.CurrentUser != null)
             {
                 UserModules = AllModules.Where(x => _authenticationProvider.CurrentUser.HasPermission(x.Permission)).ToObservableCollection();
             }
+            else if (!_authenticationProvider.AuthenticationRequired)
+            {
+                UserModules = AllModules.ToObservableCollection();
+            }
 
             ModulesLoaded?.Invoke(this, new EventArgs());
         }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index 6b6934ce5..c214d73ae 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -725,7 +725,7 @@ if $(ConfigurationName) == Debug copy /Y "$(TargetDir)Packages" "$(TargetDir)"</
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
index e280d5f9d..38dd569e1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
@@ -74,39 +74,46 @@ namespace Tango.PPC.UI.ViewModels
         /// </summary>
         public async override void OnApplicationStarted()
         {
-            using (ObservablesContext db = ObservablesContext.CreateDefault())
-            {
-                var machine = await db.Machines.FirstAsync();
+            //We don't use authentication!
 
-                if (db.Users.Count() == 1 || machine.AutoLogin)
-                {
-                    var user = await new UserBuilder(db).SetFirst().WithRolesAndPermissions().BuildAsync();
+            //using (ObservablesContext db = ObservablesContext.CreateDefault())
+            //{
+            //    var machine = await db.Machines.FirstAsync();
 
-                    if (!user.HasRole(Roles.PPCUser))
-                    {
-                        var role = db.Roles.Single(x => x.Code == (int)Roles.PPCUser);
-                        user.Roles.Add(role);
-                        db.UsersRoles.Add(new BL.Entities.UsersRole()
-                        {
-                            User = user,
-                            Role = role,
-                        });
-                        await db.SaveChangesAsync();
-                    }
+            //    if (db.Users.Count() == 1 || machine.AutoLogin)
+            //    {
+            //        var user = await new UserBuilder(db).SetFirst().WithRolesAndPermissions().BuildAsync();
 
-                    LogManager.Log($"Application started. Single user/Auto login detected ({user.Email}). Skipping LoginView...");
-                    await AuthenticationProvider.Login(user.Email, user.Password, false);
-                    await Task.Delay(1000);
-                    IsLoading = false;
-                }
-                else
-                {
-                    LogManager.Log("Application started. Navigating to LoginView...");
-                    await NavigationManager.NavigateTo(NavigationView.LoginView);
-                    await Task.Delay(1000);
-                    IsLoading = false;
-                }
-            }
+            //        if (!user.HasRole(Roles.PPCUser))
+            //        {
+            //            var role = db.Roles.Single(x => x.Code == (int)Roles.PPCUser);
+            //            user.Roles.Add(role);
+            //            db.UsersRoles.Add(new BL.Entities.UsersRole()
+            //            {
+            //                User = user,
+            //                Role = role,
+            //            });
+            //            await db.SaveChangesAsync();
+            //        }
+
+            //        LogManager.Log($"Application started. Single user/Auto login detected ({user.Email}). Skipping LoginView...");
+            //        await AuthenticationProvider.Login(user.Email, user.Password, false);
+            //        await Task.Delay(1000);
+            //        IsLoading = false;
+            //    }
+            //    else
+            //    {
+            //        LogManager.Log("Application started. Navigating to LoginView...");
+            //        await NavigationManager.NavigateTo(NavigationView.LoginView);
+            //        await Task.Delay(1000);
+            //        IsLoading = false;
+            //    }
+            //}
+
+            LogManager.Log($"Application started with no authentication mode...");
+            await AuthenticationProvider.Login();
+            await Task.Delay(1000);
+            IsLoading = false;
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
index aa9689ef3..ec316989f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
@@ -92,7 +92,13 @@ namespace Tango.PPC.UI.ViewModels
 
             await Task.Delay(500);
 
-            if (AuthenticationProvider.CurrentUser != null && AuthenticationProvider.CurrentUser.HasPermission(Permissions.RunPPC))
+            if (!AuthenticationProvider.AuthenticationRequired)
+            {
+                LogManager.Log("Application is ready! Navigating to home module...");
+                await NavigationManager.NavigateTo(NavigationView.HomeModule);
+                IsLoading = false;
+            }
+            else if (AuthenticationProvider.CurrentUser != null && AuthenticationProvider.CurrentUser.HasPermission(Permissions.RunPPC))
             {
                 LogManager.Log("Application is ready! Navigating to home module...");
                 await NavigationManager.NavigateTo(NavigationView.HomeModule);
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 22feb29c1..4215cd175 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -507,8 +507,6 @@ namespace Tango.MachineService.Controllers
                 });
             }
 
-            User machineUser = null;
-
             try
             {
                 using (ObservablesContext db = ObservablesContextHelper.CreateContext())
@@ -519,26 +517,6 @@ namespace Tango.MachineService.Controllers
                     {
                         throw new AuthenticationException("The specified machine could not be found.");
                     }
-
-                    machineUser = db.Users.Include(x => x.Contact).SingleOrDefault(x => x.Contact.FirstName == machine.Name);
-
-                    if (machineUser == null)
-                    {
-                        //No machine user then create one.
-                        machineUser = new User();
-                        machineUser.Email = machine.SerialNumber + "@twine-s.com";
-                        machineUser.Password = machine.SerialNumber;
-                        machineUser.OrganizationGuid = machine.OrganizationGuid;
-                        machineUser.Contact = new Contact();
-                        machineUser.Contact.Email = machineUser.Email;
-                        machineUser.Contact.FirstName = machine.Name;
-                        machineUser.Contact.LastName = machine.Name;
-                        machineUser.Contact.FullName = machine.Name;
-                        machineUser.Address = new Address();
-
-                        db.Users.Add(machineUser);
-                        db.SaveChanges();
-                    }
                 }
 
                 //Insert/Replace Jobs.
@@ -551,7 +529,7 @@ namespace Tango.MachineService.Controllers
                             var job = dto.ToObservable();
 
                             job.ID = 0;
-                            job.UserGuid = machineUser.Guid;
+                            job.UserGuid = dto.UserGuid;
                             job.CustomerGuid = null;
                             job.IsSynchronized = true;
 
@@ -589,7 +567,7 @@ namespace Tango.MachineService.Controllers
                         {
                             var run = dto.ToObservable();
                             run.ID = 0;
-                            run.UserGuid = machineUser.Guid;
+                            run.UserGuid = dto.UserGuid;
                             run.IsSynchronized = true;
 
                             if (db.JobRuns.SingleOrDefault(x => x.Guid == run.Guid) == null)
@@ -618,7 +596,7 @@ namespace Tango.MachineService.Controllers
                         {
                             var ev = dto.ToObservable();
                             ev.ID = 0;
-                            ev.UserGuid = machineUser.Guid;
+                            ev.UserGuid = dto.UserGuid;
                             ev.IsSynchronized = true;
 
                             if (db.MachinesEvents.SingleOrDefault(x => x.Guid == ev.Guid) == null)