1 files changed, 10 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
index d20b74c77..16395d6bc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
@@ -274,6 +274,11 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             try
             {
                 ManagedUser.Validate(_userContext);
+
+                if (ManagedUser.Roles.GroupBy(x => x.RoleEnum).Any(x => x.Count() > 1))
+                {
+                    throw new InvalidOperationException("Cannot save user with duplicate roles.");
+                }
             }
             catch (Exception ex)
             {
@@ -296,6 +301,11 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             try
             {
                 ManagedUser.Validate(_userContext);
+
+                if (ManagedUser.Roles.GroupBy(x => x.RoleEnum).Any(x => x.Count() > 1))
+                {
+                    throw new InvalidOperationException("Cannot save user with duplicate roles.");
+                }
             }
             catch (Exception ex)
             {