1 files changed, 13 insertions, 9 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 344d677ff..56888e631 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
@@ -193,19 +193,21 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             }
         }
 
-        private void LoadSelectedUser()
+        private async void LoadSelectedUser()
         {
             using (_notification.PushTaskItem("Loading user details..."))
             {
-                Task.Factory.StartNew(() =>
+                await Task.Factory.StartNew(() =>
                 {
                     _userContext = ObservablesContext.CreateDefault();
+                    _userContext.Configuration.LazyLoadingEnabled = false;
+
                     Roles = _userContext.Roles.ToObservableCollection();
-                    ManagedUser = _userContext.Users.SingleOrDefault(x => x.Guid == SelectedUser.Guid);
+                    ManagedUser = _userContext.GetUser(SelectedUser.Guid);
                     ManagedUserRoles = ManagedUser.Roles.ToObservableCollection();
-
-                    InvokeUI(() => _navigation.NavigateTo(UsersAndRolesNavigationView.UserManagementView));
                 });
+
+                _navigation.NavigateTo(UsersAndRolesNavigationView.UserManagementView);
             }
         }
 
@@ -248,17 +250,19 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             }
         }
 
-        private void LoadSelectedOrganization()
+        private async void LoadSelectedOrganization()
         {
             using (_notification.PushTaskItem("Loading organization..."))
             {
-                Task.Factory.StartNew(() =>
+                await Task.Factory.StartNew(() =>
                 {
                     _manageContext = ObservablesContext.CreateDefault();
-                    ManagedOrganization = _manageContext.Organizations.SingleOrDefault(x => x.Guid == SelectedOrganization.Guid);
+                    _manageContext.Configuration.LazyLoadingEnabled = false;
 
-                    InvokeUI(() => _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationManagementView));
+                    ManagedOrganization = _manageContext.GetOrganizationAndUsers(SelectedOrganization.Guid);
                 });
+
+                _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationManagementView);
             }
         }