diff --git a/ConfectionaryListImplement/ClientStorage.cs b/ConfectionaryListImplement/ClientStorage.cs
index 7540b52..7a43dca 100644
--- a/ConfectionaryListImplement/ClientStorage.cs
+++ b/ConfectionaryListImplement/ClientStorage.cs
@@ -66,8 +66,15 @@ namespace ConfectioneryListImplement
 
         public ClientViewModel? Insert(ClientBindingModel model)
         {
-            model.Id = _source.Clients.Count > 0 ? _source.Clients.Max(x => x.Id) + 1 : 1;
-            var res = Client.Create(model);
+			model.Id = 1;
+			foreach (var component in _source.Components)
+			{
+				if (model.Id <= component.Id)
+				{
+					model.Id = component.Id + 1;
+				}
+			}
+			var res = Client.Create(model);
             if (res != null)
             {
                 _source.Clients.Add(res);
diff --git a/ConfectioneryDatabaseImplement/Order.cs b/ConfectioneryDatabaseImplement/Order.cs
index 3c815b4..080e04a 100644
--- a/ConfectioneryDatabaseImplement/Order.cs
+++ b/ConfectioneryDatabaseImplement/Order.cs
@@ -84,6 +84,7 @@ namespace ConfectioneryDatabaseImplement.Models
                 return new()
                 {
                     PastryName = context.Pastries.FirstOrDefault(x => x.Id == PastryId)?.PastryName ?? string.Empty,
+                    ClientId = ClientId,
                     ClientFIO = Client?.ClientFIO ?? string.Empty,
                     PastryId = PastryId,
                     Count = Count,