MERGE

1 files changed, 6 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
index 6af1184aa..044b8a88a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
@@ -80,12 +80,17 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             if (EditEntity.Email != null)
             {
-                if (Adapter.Users.ToList().Exists(x => x.Email.ToLower() == EditEntity.Email.ToLower()))
+                if (Adapter.Users.ToList().Exists(x => x != EditEntity && x.Email.ToLower() == EditEntity.Email.ToLower()))
                 {
                     ValidationErrors.Add("Email already exist");
                 }
             }
 
+            if (!EditEntity.Email.IsEmail())
+            {
+                ValidationErrors.Add("Email address is invalid");
+            }
+
             if (!EditEntity.Password.IsMinLength(4))
             {
                 ValidationErrors.Add("Password must have at least 4 characters");