diff --git a/.version b/.version
index a262af0..8c35e70 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.17.22.36
\ No newline at end of file
+0.17.22.37
\ No newline at end of file
diff --git a/NetinaShop.Api/NetinaShop.Api.csproj b/NetinaShop.Api/NetinaShop.Api.csproj
index 9062acc..1ef90d1 100644
--- a/NetinaShop.Api/NetinaShop.Api.csproj
+++ b/NetinaShop.Api/NetinaShop.Api.csproj
@@ -6,8 +6,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <InvariantGlobalization>true</InvariantGlobalization>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <AssemblyVersion>0.17.22.36</AssemblyVersion>
-    <FileVersion>0.17.22.36</FileVersion>
+    <AssemblyVersion>0.17.22.37</AssemblyVersion>
+    <FileVersion>0.17.22.37</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/NetinaShop.Core/EntityServices/OrderBagHandlers/SubmitOrderPaymentCommandHandler.cs b/NetinaShop.Core/EntityServices/OrderBagHandlers/SubmitOrderPaymentCommandHandler.cs
index 6897600..edc3c8a 100644
--- a/NetinaShop.Core/EntityServices/OrderBagHandlers/SubmitOrderPaymentCommandHandler.cs
+++ b/NetinaShop.Core/EntityServices/OrderBagHandlers/SubmitOrderPaymentCommandHandler.cs
@@ -35,6 +35,8 @@ public class SubmitOrderPaymentCommandHandler : IRequestHandler<SubmitOrderPayme
             {
                 response.NeedToPayOnline = false;
                 order.SetOrderPayment(request.PaymentMethod);
+                _repositoryWrapper.SetRepository<Order>().Update(order);
+                await _repositoryWrapper.SaveChangesAsync(cancellationToken);
             }
             else
             {
diff --git a/NetinaShop.Domain/MartenEntities/Settings/ShopSetting.cs b/NetinaShop.Domain/MartenEntities/Settings/ShopSetting.cs
index d14d3ce..a8a9027 100644
--- a/NetinaShop.Domain/MartenEntities/Settings/ShopSetting.cs
+++ b/NetinaShop.Domain/MartenEntities/Settings/ShopSetting.cs
@@ -5,6 +5,8 @@ public class ShopSetting
     public string Name { get; set; } = string.Empty;
     public string Description { get; set; } = string.Empty;
     public string Slogan { get; set; } = string.Empty;
+    public string City { get; set; } = string.Empty;
+    public string Province { get; set; } = string.Empty;
     public double LocationLat { get; set; }
     public double LocationLon { get; set; }
     public string Address { get; set; } = string.Empty;
diff --git a/NetinaShop.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs b/NetinaShop.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs
index 34161a3..0716af0 100644
--- a/NetinaShop.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs
+++ b/NetinaShop.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs
@@ -40,6 +40,8 @@ public class CreateOrUpdatePaymentCommandHandler : IRequestHandler<CreateOrUpdat
                 var newEnt = Payment.Create(request.FactorNumber, request.Amount, request.Description, request.TransactionCode,
                     request.CardPan, request.Authority, request.Type, request.Status, request.OrderId, request.UserId);
                 newEnt.Id = orderPayment.Id;
+                newEnt.CreatedAt = orderPayment.CreatedAt;
+                newEnt.CreatedBy = orderPayment.CreatedBy;
 
                 _repositoryWrapper.SetRepository<Payment>()
                     .Update(newEnt);