1 files changed, 7 insertions, 1 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 81ef04dd4..d20b74c77 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
@@ -407,7 +407,11 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
 
                 try
                 {
-                    user.Validate(_manageContext);
+                    if (!user.Validate(_manageContext))
+                    {
+                        _notification.ShowError(String.Join(Environment.NewLine, user.ValidationErrors));
+                        return;
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -423,6 +427,8 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                     _actionLogManager.InsertLog(ActionLogType.UserCreated, _authenticationProvider.CurrentUser, user.Email, user, "User created using Machine Studio.");
                     await LoadOrganizations();
                     SelectedOrganization = Organizations.SingleOrDefault(x => x.Guid == ManagedOrganization.Guid);
+                    SelectedUser = user;
+                    LoadSelectedUser();
                 }
             });
         }