diff --git a/.version b/.version
index 3904f41..d5a7440 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.27.35.57
\ No newline at end of file
+0.27.36.58
\ No newline at end of file
diff --git a/Netina.Api/Program.cs b/Netina.Api/Program.cs
index a200ed6..c3d3365 100644
--- a/Netina.Api/Program.cs
+++ b/Netina.Api/Program.cs
@@ -8,7 +8,7 @@ string env = builder.Environment.IsDevelopment() == true ? "Development" : "Prod
 builder.Host.UseContentRoot(Directory.GetCurrentDirectory());
 if (builder.Environment.IsDevelopment())
 {
-    string projectName = "Hamyan";
+    string projectName = "Vesmeh";
     builder.Configuration.AddJsonFile($"AppSettings/appsettings.json").AddJsonFile($"AppSettings/appsettings.{env}{projectName}.json");
 }
 
diff --git a/Netina.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs b/Netina.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs
index 016a8a3..39b7566 100644
--- a/Netina.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs
+++ b/Netina.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs
@@ -24,6 +24,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 = ent.Id;
+            newEnt.CreatedAt = ent.CreatedAt == DateTime.MinValue ? DateTime.Now : ent.CreatedAt;
+            newEnt.CreatedBy = ent.CreatedBy;
 
             _repositoryWrapper.SetRepository<Payment>()
                 .Update(newEnt);
@@ -40,9 +42,9 @@ 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.CreatedAt = orderPayment.CreatedAt == DateTime.MinValue ? DateTime.Now : orderPayment.CreatedAt;
                 newEnt.CreatedBy = orderPayment.CreatedBy;
-
+                
                 _repositoryWrapper.SetRepository<Payment>()
                     .Update(newEnt);