diff --git a/src/app/system/configurations/business-date-tab/business-date-tab.component.html b/src/app/system/configurations/business-date-tab/business-date-tab.component.html
index f23f252b8..799be8dbd 100644
--- a/src/app/system/configurations/business-date-tab/business-date-tab.component.html
+++ b/src/app/system/configurations/business-date-tab/business-date-tab.component.html
@@ -44,7 +44,7 @@
                     Submit
                   </button>
                 </span>
-                <button mat-button *ngIf="isEditInProgress" (click)="editInProgressToggle(0)">
+                <button mat-button *ngIf="isEditInProgress && (dateIndex == 0)" (click)="editInProgressToggle(0)">
                   Cancel
                 </button>
                 <button type="button" color="primary" *ngIf="!isEditInProgress" mat-icon-button matTooltip="Edit the Business Date"
@@ -80,7 +80,7 @@
                     Submit
                   </button>
                 </span>
-                <button mat-button *ngIf="isEditInProgress" (click)="editInProgressToggle(1)">
+                <button mat-button *ngIf="isEditInProgress && (dateIndex == 1)" (click)="editInProgressToggle(1)">
                   Cancel
                 </button>
                 <button type="button" color="primary" *ngIf="!isEditInProgress" mat-icon-button matTooltip="Edit the COB Date"
diff --git a/src/app/system/configurations/business-date-tab/business-date-tab.component.ts b/src/app/system/configurations/business-date-tab/business-date-tab.component.ts
index 9ad1a0518..58b0ab469 100644
--- a/src/app/system/configurations/business-date-tab/business-date-tab.component.ts
+++ b/src/app/system/configurations/business-date-tab/business-date-tab.component.ts
@@ -88,8 +88,14 @@ export class BusinessDateTabComponent implements OnInit {
       businessDateData.forEach((data: any) => {
         if (data.type === SettingsService.businessDateType) {
           this.businessDate = new Date(data.date);
+          this.businessDateForm.patchValue({
+            businessDate: this.businessDate
+          });
         } else {
           this.cobDate = new Date(data.date);
+          this.businessDateForm.patchValue({
+            cobDate: this.cobDate
+          });
         }
       });
     });