1 files changed, 21 insertions, 10 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 2f4e5c9a3..81ef04dd4 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
@@ -370,20 +370,19 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             }
         }
 
-        private async void AddNewUser()
+        private void AddNewUser()
         {
-            String email = _notification.ShowTextInput("Enter user email", "email");
-
-            if (!String.IsNullOrWhiteSpace(email))
+            _notification.ShowModalDialog<UserCreationDialogVM>(async (vm) =>
             {
                 User user = new User();
-                user.Email = email;
-                user.Password = "1111";
+                user.Email = vm.Email;
+                user.Password = User.GetPasswordHash(vm.Password);
+                user.PasswordChangeRequired = true;
                 user.Contact = new Contact()
                 {
-                    FirstName = "Twine",
-                    LastName = "User",
-                    Email = email,
+                    FirstName = vm.FirstName,
+                    LastName = vm.LastName,
+                    Email = vm.Email,
                 };
 
                 user.Address = new Address();
@@ -394,6 +393,18 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                     Role = _manageContext.Roles.SingleOrDefault(x => x.Code == (int)BL.Enumerations.Roles.User)
                 });
 
+                user.UsersRoles.Add(new UsersRole()
+                {
+                    User = user,
+                    Role = _manageContext.Roles.SingleOrDefault(x => x.Code == (int)BL.Enumerations.Roles.MachineStudioUser)
+                });
+
+                user.UsersRoles.Add(new UsersRole()
+                {
+                    User = user,
+                    Role = _manageContext.Roles.SingleOrDefault(x => x.Code == (int)BL.Enumerations.Roles.PPCUser)
+                });
+
                 try
                 {
                     user.Validate(_manageContext);
@@ -413,7 +424,7 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                     await LoadOrganizations();
                     SelectedOrganization = Organizations.SingleOrDefault(x => x.Guid == ManagedOrganization.Guid);
                 }
-            }
+            });
         }
 
         private void SetUserPlace(Place place)