Index: branches/UserManagement/HeuristicLab.Services.Authentication.TestClient/UserManagement.cs
===================================================================
--- branches/UserManagement/HeuristicLab.Services.Authentication.TestClient/UserManagement.cs	(revision 4590)
+++ branches/UserManagement/HeuristicLab.Services.Authentication.TestClient/UserManagement.cs	(revision 4647)
@@ -15,4 +15,5 @@
 
         AuthenticationService service;
+        Guid applicationId = new Guid("04371D20-8FD4-4607-A632-42C8D186786B");
 
         public UserManagement()
@@ -21,4 +22,6 @@
             Initialize();
         }
+
+
         private void Initialize()
         {
@@ -26,78 +29,11 @@
             if (service != null)
             {
-                this.bsRoles.DataSource = service.GetRoles();
-                this.bsUsers.DataSource = service.GetUsers();
+                this.bsRoles.DataSource = service.GetRoles(applicationId);
+                this.bsUsers.DataSource = service.GetUsers(applicationId);
 
             }
         }
 
-        private void btnUserNew_Click(object sender, EventArgs e)
-        {
-            UserDetail frmUserDetail = new UserDetail(UserDetailMode.Insert, service);
-            frmUserDetail.Show(this);
-        }
-
-
-        private void btnUserModify_Click(object sender, EventArgs e)
-        {
-
-           
-            if (dgvUsers.SelectedRows.Count == 1)
-            {
-                User user = (User)dgvUsers.SelectedRows[0].DataBoundItem; 
-                if (user != null)
-                {
-                   
-                    UserDetail frmUserDetail = new UserDetail(UserDetailMode.Update,service);
-                    frmUserDetail.Show(this);
-                    frmUserDetail.Initialize(user);
-                }
-            }
-        }
-
-        private void btnUserDelete_Click(object sender, EventArgs e)
-        {
-            if (dgvUsers.SelectedRows.Count == 1)
-            {
-                User user = (User)dgvUsers.SelectedRows[0].DataBoundItem;
-                if (user != null)
-                {
-                    service.DeleteUser(user.UserId);
-                }
-            }
-        }
-
-        private void btnRoleNew_Click(object sender, EventArgs e)
-        {
-            RoleDetail frmRoleDetail = new RoleDetail(RoleDetailMode.Insert, service,null);
-            frmRoleDetail.Show(this);
-        }          
-
-        private void btnRoleModify_Click(object sender, EventArgs e)
-        {
-            if (dgvRoles.SelectedRows.Count == 1)
-            {
-                Role role = (Role)dgvRoles.SelectedRows[0].DataBoundItem;
-                if (role != null)
-                {
-
-                    RoleDetail frmRoleDetail = new RoleDetail(RoleDetailMode.Update, service, role);
-                    frmRoleDetail.Show(this);
-                  
-                }
-            }
-        }
-
-        private void btnRoleDelete_Click(object sender, EventArgs e)
-        {
-            if (dgvRoles.SelectedRows.Count == 1)
-            {
-                Role role = (Role)dgvRoles.SelectedRows[0].DataBoundItem;
-                if (role != null)
-                {
-                    service.DeleteRole(role.RoleId);
-                }
-            }
-        }
+