diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
index f025dd128..a7f1b0b6e 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
@@ -221,13 +221,13 @@
       <input type="number" matInput formControlName="fixedEmiAmount">
     </mat-form-field>
 
-    <ng-container *ngIf="loansAccountTermsData?.canUseForTopup">
+    <ng-container *ngIf="loansAccountTermsData?.isTopup">
 
-      <mat-checkbox fxFlex="48%" formControlName="isTopup">
+      <mat-checkbox fxFlex="20%" formControlName="isTopup">
         <p>{{"labels.inputs.Is Topup Loan" | translate}}?</p>
       </mat-checkbox>
 
-      <mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.isTopup.value">
+      <mat-form-field fxFlex="24%" *ngIf="loansAccountTermsForm.controls.isTopup.value">
         <mat-label>{{"labels.inputs.Loan closed with Topup" | translate}}</mat-label>
         <mat-select formControlName="loanIdToClose">
           <mat-option *ngFor="let clientActiveLoan of clientActiveLoanData" [value]="clientActiveLoan.id">
diff --git a/src/app/loans/loans-view/loan-delinquency-tags-tab/loan-delinquency-tags-tab.component.ts b/src/app/loans/loans-view/loan-delinquency-tags-tab/loan-delinquency-tags-tab.component.ts
index 149c9b931..b60eff169 100644
--- a/src/app/loans/loans-view/loan-delinquency-tags-tab/loan-delinquency-tags-tab.component.ts
+++ b/src/app/loans/loans-view/loan-delinquency-tags-tab/loan-delinquency-tags-tab.component.ts
@@ -129,7 +129,22 @@ export class LoanDelinquencyTagsTabComponent implements OnInit {
 
   isCurrentAndPauseAction(item: LoanDelinquencyAction): boolean {
     if (this.currentLoanDelinquencyAction != null) {
-      return (this.currentLoanDelinquencyAction.id === item.id && item.action === 'PAUSE');
+      if (this.currentLoanDelinquencyAction.id === item.id) {
+        if (item.action === 'PAUSE') {
+          const businessDate: Date = this.settingsService.businessDate;
+          const startDate: Date = this.dateUtils.parseDate(item.startDate);
+          if (businessDate < startDate) {
+            return false;
+          }
+          if (item.endDate) {
+            const endDate: Date = this.dateUtils.parseDate(item.endDate);
+            if (businessDate > endDate) {
+              return false;
+            }
+          }
+          return true;
+        }
+      }
     }
     return false;
   }