diff --git a/AccountManagement.Application/TaskScheduleApplication.cs b/AccountManagement.Application/TaskScheduleApplication.cs
index 7e0d88f4..b43384f4 100644
--- a/AccountManagement.Application/TaskScheduleApplication.cs
+++ b/AccountManagement.Application/TaskScheduleApplication.cs
@@ -9,8 +9,6 @@ using System.Threading.Tasks;
 using System.Transactions;
 using AccountManagement.Domain.TaskAgg;
 using Company.Domain.HolidayItemAgg;
-using PersianTools.Core;
-using CompanyManagment.App.Contracts.Loan;
 
 namespace AccountManagement.Application;
 
@@ -77,9 +75,9 @@ public class TaskScheduleApplication : ITaskScheduleApplication
         {
             taskSchedule.DeActive();
 
-            var removableTask = tasks.Where(x => x.Assigns.All(a => a.IsDone == false && a.IsCancel == false)).ToList();
+            var removableTask = tasks.Where(x=>x.Assigns.All(a=>a.IsDone==false && a.IsCancel == false)).ToList();
             _taskRepository.RemoveRange(removableTask);
-
+            
         }
         else
         {
@@ -172,7 +170,7 @@ public class TaskScheduleApplication : ITaskScheduleApplication
 
                     if (endOfMonth)
                     {
-                        for (int i = 1; i < count; i++)
+                        for (int i = 1; i <= count; i++)
                         {
                             command.EndTaskDate = previousDateEdited.ToFarsi();
                             operation = _taskApplication.CreateTask(command);
@@ -181,7 +179,7 @@ public class TaskScheduleApplication : ITaskScheduleApplication
                             {
                                 var extra = month - 12;
                                 year++;
-                                month = extra+unitNumber;
+                                month = extra + unitNumber;
                             }
                             else
                             {
@@ -196,7 +194,7 @@ public class TaskScheduleApplication : ITaskScheduleApplication
 
                             }
 
-                            
+
 
                             previousDateEdited = previousDateRaw;
 
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateScheduleModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateScheduleModal.cshtml
index cb89c12e..3cc62ab9 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateScheduleModal.cshtml
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateScheduleModal.cshtml
@@ -118,23 +118,23 @@
                         <label class="labelTM">بازه دوره</label>
 						    <div class="d-flex schedulePartHodler">
                                 <div class="from-group schedulePart" id="scheduleTypeSelector">
-                                    <select class="form-select select2ScheduleTypeSelector scheduleTypeSelector">
-                                        <option id="type0" value="0">انتخاب...</option>
-                                        <option id="type1" value="Day">روزانه</option>
-                                        <option id="type2" value="Week">هفتگی</option>
-                                        <option id="type3" value="Month">ماهانه</option>
+                                    <select class="form-select select2ScheduleTypeSelector scheduleTypeSelector" id="scheduleType">
+                                        <option id="type0" value="0" selected="selected" disabled="disabled">انتخاب...</option>
+                                        <option id="type1" value="day">روزانه</option>
+                                        <option id="type2" value="week">هفتگی</option>
+                                        <option id="type3" value="month">ماهانه</option>
                                     </select>
                                 </div>
 
                                 <div class="from-group schedulePart selectType default" id="scheduleTypeDefault">
                                     <select class="form-select select2Period ">
-                                        <option id ="default0" value=0>انتخاب...</option>
+                                        <option id ="default0" value=0 selected="selected" disabled="disabled">انتخاب...</option>
                                     </select>
                                 </div>
 
                                 <div class="from-group schedulePart selectType" id="scheduleTypeDay" style="display: none;">
                                     <select class="form-select select2Period ">
-                                        <option id ="day0" value=0>انتخاب...</option>
+                                        <option id ="day0" value=0 selected="selected" disabled="disabled">انتخاب...</option>
                                         <option id="d1" value="1">1</option>
                                         <option id="d2" value="2">2</option>
                                         <option id="d3" value="3">3</option>
@@ -169,7 +169,7 @@
 
                                 <div class="from-group schedulePart selectType" id="scheduleTypeWeek" style="display: none;">
                                     <select class="form-select select2Period ">
-                                        <option value=0>انتخاب...</option>
+                                        <option value=0 selected="selected" disabled="disabled">انتخاب...</option>
                                         <option value="first">اول هفته</option>
                                         <option value="last">آخر هفته</option>
                                     </select>
@@ -177,7 +177,7 @@
 
 							    <div class="from-group schedulePart selectType" id="scheduleTypeMonth" style="display: none;">
                                     <select class="form-select select2Period ">
-								        <option id="m0" value=0>انتخاب...</option>
+								        <option id="m0" value=0 selected="selected" disabled="disabled">انتخاب...</option>
                                         <option id="m1" value="1">1</option>
                                         <option id="m2" value="2">2</option>
                                         <option id="m3" value="3">3</option>
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/CreateScheduleModal.js b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/CreateScheduleModal.js
index 6d655866..151a914c 100644
--- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/CreateScheduleModal.js
+++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/CreateScheduleModal.js
@@ -105,17 +105,16 @@ $(document).ready(function () {
 
 
     //validation for selectScheduleType and show day month or week
-    $(".scheduleTypeSelector").change(function() {
-        var scheduleType = $(".scheduleTypeSelector").val();
-
+    $("#scheduleType").change(function() {
+        var scheduleType = $("#scheduleType").val();
         switch (scheduleType) {
-            case "Day":
+            case "day":
                 selectShow("scheduleTypeDay");
                 break;
-            case "Week":
+            case "week":
                 selectShow("scheduleTypeWeek");
                 break;
-            case "Month":
+            case "month":
                 selectShow("scheduleTypeMonth");
                 break;
             default:
@@ -1175,6 +1174,7 @@ if (navigator.mediaDevices.getUserMedia) {
     }
 
     function stop() {
+        if (!mediaRecorder) return;
         $("#waveArea").show();
         //$('.upload-voice-container').show();
         //$('.upload-voice-container').addClass('d-flex');
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js
index 3d79c161..f178b547 100644
--- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js
+++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js
@@ -977,6 +977,8 @@ if (navigator.mediaDevices.getUserMedia) {
     }
 
     function stop() {
+        if (!mediaRecorder) return;
+
         $("#waveArea").show();
         //$('.upload-voice-container').show();
         //$('.upload-voice-container').addClass('d-flex');