diff --git a/src/app/loans/edit-loans-account/edit-loans-account.component.ts b/src/app/loans/edit-loans-account/edit-loans-account.component.ts
index 9663196e6..a91331df9 100644
--- a/src/app/loans/edit-loans-account/edit-loans-account.component.ts
+++ b/src/app/loans/edit-loans-account/edit-loans-account.component.ts
@@ -125,7 +125,7 @@ export class EditLoansAccountComponent implements OnInit {
       locale,
       loanType
     };
-
+    delete loansAccountData.isValid;
     if (loansAccountData.syncRepaymentsWithMeeting) {
       loansAccountData.calendarId = this.loansAccountProductTemplate.calendarOptions[0].id;
       delete loansAccountData.syncRepaymentsWithMeeting;
@@ -141,7 +141,6 @@ export class EditLoansAccountComponent implements OnInit {
     if (!(loansAccountData.isFloatingInterestRate === false)) {
       delete loansAccountData.isFloatingInterestRate;
     }
-
     this.loansService.updateLoansAccount(this.loanId, loansAccountData).subscribe((response: any) => {
       this.router.navigate(['../'], { relativeTo: this.route });
     });
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 b7343e891..0cd92e159 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
@@ -320,7 +320,7 @@
         <mat-label>Maximum allowed outstanding balance</mat-label>
         <input matInput required formControlName="loanTermFrequency">
       </mat-form-field>
-      <span fxFlex>
+      <span fxFlex *ngIf="!loansAccountProductTemplate?.product.disallowExpectedDisbursements">
         <button type="button" mat-icon-button color="primary" (click)="addDisbursementDataEntry(disbursementData)">
           <fa-icon icon="plus-circle" size="lg"></fa-icon>
         </button>
diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
index e087ca17e..8d23b14b4 100644
--- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
+++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
@@ -73,7 +73,8 @@ export class TransactionsTabComponent implements OnInit {
    * @param transactionsData Transactions Data
    */
   showTransactions(transactionsData: any) {
-    if (transactionsData.type.id === 2 || transactionsData.type.id === 4 || transactionsData.type.id === 1) {
+    if (transactionsData.type.id === 2 || transactionsData.type.id === 4 || transactionsData.type.id === 1
+      || transactionsData.type.id === 21 || transactionsData.type.id === 22 || transactionsData.type.id === 23) {
       this.router.navigate([transactionsData.id], { relativeTo: this.route });
     }
   }