diff --git a/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs b/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
index 48bd4fd7..a12a6086 100644
--- a/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
+++ b/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
@@ -219,7 +219,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 
         }
 
-        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.id));
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
 
         foreach (var item in permittedToOverWrite)
         {
diff --git a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
index 553a98fe..cf4a3e61 100644
--- a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
+++ b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
@@ -1602,19 +1602,19 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         foreach (var command in commands)
         {
             var fromDateGr = command.FromDate.ToGeorgianDateTime();
-            if (_checkoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart))
+            if (_checkoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
             {
                 isSuccess = false;
                 employeeIdsHasCheckout.Add(command.EmployeeId);
             }
 
-            if (_customizeCheckoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart))
+            if (_customizeCheckoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
             {
                 isSuccess = false;
                 employeeIdsHasCheckout.Add(command.EmployeeId);
             }
 
-            if (_customizeCheckoutTempRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractStart))
+            if (_customizeCheckoutTempRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
             {
                 isSuccess = false;
                 employeeIdsHasCheckout.Add(command.EmployeeId);
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js
index 6098fe86..1a621d3a 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ConfirmEmployeeChange.js
@@ -154,11 +154,12 @@ function employeeList() {
 }
 
 $('#initialDateInput').on('input', function () {
-    new Cleave('.dateInput', {
-        delimiters: ['/', '/'],
-        blocks: [4, 2, 2],
-        numericOnly: true
-    });
+    $('.dateInput').mask('0000/00/00')
+    //new Cleave('.dateInput', {
+    //    delimiters: ['/', '/'],
+    //    blocks: [4, 2, 2],
+    //    numericOnly: true
+    //});
 	// new Cleave('.dateInput', {
     //     date: true,
     //     datePattern: ['Y', 'm', 'd']
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js
index 71543b81..502811ba 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js
@@ -897,11 +897,11 @@ async function postChangeEditGroup() {
             $('.btn-confirm').removeClass('disable');
         }
     } else {
-        $('.alert-success-msg').show();
-        $('.alert-success-msg p').text(responseValid.message);
+        $('.alert-msg').show();
+        $('.alert-msg p').text(responseValid.message);
         setTimeout(function () {
-            $('.alert-success-msg').hide();
-            $('.alert-success-msg p').text('');
+            $('.alert-msg').hide();
+            $('.alert-msg p').text('');
         }, 3500);
 
         // Updating the employees that who has checkout