diff --git a/FoodsharingSiegen.Server/Pages/Users.razor b/FoodsharingSiegen.Server/Pages/Users.razor
index d2cfa57..96f489b 100644
--- a/FoodsharingSiegen.Server/Pages/Users.razor
+++ b/FoodsharingSiegen.Server/Pages/Users.razor
@@ -92,9 +92,9 @@
                               Data="@UserGroups"
                               TextField="@(( item ) => item.ToString())"
                               ValueField="@(( item ) => item)"
-                              Multiple="true"
+                              SelectionMode="AutocompleteSelectionMode.Multiple"
                               SelectedValues="@((List<UserGroup>) context.CellValue)"
-                              SelectedValuesChanged="@(v => context.CellValue = v)"
+                              SelectedValuesChanged="@(v => { context.CellValue = v.ToList(); })"
                               @bind-SelectedTexts="SelectedCompanyTexts">
                 </Autocomplete>
                 <small>Verfügbar: @string.Join(", ", Enum.GetValues<UserGroup>())</small>
diff --git a/FoodsharingSiegen.Server/Pages/Users.razor.cs b/FoodsharingSiegen.Server/Pages/Users.razor.cs
index 679a755..7adf746 100644
--- a/FoodsharingSiegen.Server/Pages/Users.razor.cs
+++ b/FoodsharingSiegen.Server/Pages/Users.razor.cs
@@ -134,7 +134,7 @@ namespace FoodsharingSiegen.Server.Pages
         /// <param name="arg">The arg</param>
         private async Task RowInserted(SavedRowItem<User, Dictionary<string, object>> arg)
         {
-            var addUserR = await UserService.AddUserAsync(arg.Item);
+            var addUserR = await UserService.AddUserAsync(arg.OldItem);
             if (!addUserR.Success)
                 await Notification.Error($"Fehler beim Anlegen: {addUserR.ErrorMessage}")!;
             else
@@ -151,9 +151,9 @@ namespace FoodsharingSiegen.Server.Pages
         /// <param name="arg">The arg</param>
         private async Task RowUpdated(SavedRowItem<User, Dictionary<string, object>> arg)
         {
-            if (arg.Item?.Id == null || arg.Item.Id.Equals(Guid.Empty) || arg.Values?.Any() != true) return;
+            if (arg.OldItem?.Id == null || arg.OldItem.Id.Equals(Guid.Empty) || arg.Values?.Any() != true) return;
 
-            var updateR = await UserService.Update(arg.Item);
+            var updateR = await UserService.Update(arg.OldItem);
             if (!updateR.Success)
                 await Notification.Error($"Fehler beim Speichern: {updateR.ErrorMessage}")!;
         }
diff --git a/FoodsharingSiegen.Server/Shared/DefaultLayout.razor b/FoodsharingSiegen.Server/Shared/DefaultLayout.razor
index 551a3a0..a453a61 100644
--- a/FoodsharingSiegen.Server/Shared/DefaultLayout.razor
+++ b/FoodsharingSiegen.Server/Shared/DefaultLayout.razor
@@ -24,5 +24,5 @@
     </NotAuthorized>
 </AuthorizeView>
 
-<NotificationAlert/>
-<MessageAlert/>
\ No newline at end of file
+<NotificationProvider/>
+<MessageProvider/>
\ No newline at end of file