diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index d420664..344483d 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -29,7 +29,27 @@ else
         <DataGridColumn TItem="User" Field="@nameof(User.FirstName)" Caption="First Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.LastName)" Caption="Last Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.EMail)" Caption="EMail" Editable="true"/>
-        <DataGridSelectColumn TItem="User" Field="@nameof(User.Parent)" Caption="Parent" Editable="true"/>
+        <DataGridSelectColumn TItem="User" Field="@nameof(User.Parent)" Caption="Parent" Editable="true">
+            <DisplayTemplate>
+                @{
+                    var name = ((User) context).Parent?.CommonName ?? "-";
+                    @name
+                }
+
+            </DisplayTemplate>
+            <EditTemplate>
+                @{
+                    <Blazorise.SelectEdit TValue="User" SelectedValue="@((User)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)">
+                    @foreach (var item in OrganizationUnits)
+                    {
+
+                        <SelectItem TValue="OrganizationUnit" Value="@(item)">@item.CommonName</SelectItem>
+                    }
+                    </Blazorise.SelectEdit>
+                }
+
+            </EditTemplate>
+        </DataGridSelectColumn>
         <DataGridCheckColumn TItem="User" Field="@nameof(User.IsActive)" Caption="Active" Editable="true"/>
     </DataGrid>
 }
\ No newline at end of file