diff --git a/.idea/.idea.UserService/riderModule.iml b/.idea/.idea.UserService/riderModule.iml
index 19473e1..882628e 100644
--- a/.idea/.idea.UserService/riderModule.iml
+++ b/.idea/.idea.UserService/riderModule.iml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RIDER_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.6.1/build/netcoreapp2.1" />
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.6.1/build/netcoreapp2.1/x64/testhost.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.6.1/build/netcoreapp2.1/x64/testhost.exe" />
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.7.0/build/netcoreapp2.1" />
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.7.0/build/netcoreapp2.1/x64/testhost.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.7.0/build/netcoreapp2.1/x64/testhost.exe" />
     <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.dll" />
     <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.pdb" />
     <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.api.dll" />
diff --git a/UserService.db b/UserService.db
index e800eca..cef1d65 100644
Binary files a/UserService.db and b/UserService.db differ
diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index 16e99a6..d72a398 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -12,17 +12,33 @@
 }
 else
 {
-    <DataGrid TItem="User" Editable="true" EditMode="DataGridEditMode.Inline" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowUpdating="RowUpdatingCallback">
+    <DataGrid TItem="User" RowSelectable="@(u => false)" Editable="true" EditMode="DataGridEditMode.Inline" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowUpdating="RowUpdatingCallback">
         <DataGridCommandColumn TItem="User">
             <NewCommandTemplate>
-                <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user"><i class="fa fa-user-plus"></i></Button>
+                <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user">
+                    <i class="fa fa-user-plus"></i>
+                </Button>
             </NewCommandTemplate>
             <EditCommandTemplate>
-                <Button Color="Color.Primary" Clicked="@context.Clicked" title="Edit user"><i class="fa fa-user-edit"></i></Button>
+                <Button Color="Color.Primary" Clicked="@context.Clicked" title="Edit user">
+                    <i class="fa fa-user-edit"></i>
+                </Button>
             </EditCommandTemplate>
             <DeleteCommandTemplate>
-                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Delete user"><i class="fa fa-user-minus"></i></Button>
+                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Delete user">
+                    <i class="fa fa-user-minus"></i>
+                </Button>
             </DeleteCommandTemplate>
+            <SaveCommandTemplate>
+                <Button Color="Color.Success" Clicked="@context.Clicked" title="Save user">
+                    <i class="fas fa-save"></i>
+                </Button>
+            </SaveCommandTemplate>
+            <CancelCommandTemplate>
+                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Cancel editing">
+                    <i class="far fa-times-circle"></i>
+                </Button>
+            </CancelCommandTemplate>
         </DataGridCommandColumn>
         <DataGridColumn TItem="User" Field="@nameof(User.Id)" Caption="#" Sortable="false"/>
         <DataGridColumn TItem="User" Field="@nameof(User.CommonName)" Caption="CN" CellsEditableOnEditCommand="false" Editable="true"/>