diff --git a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
index 2afb22ef1..21679a7ba 100644
--- a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
+++ b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.ts
@@ -1,13 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input } from '@angular/core';
-import {
-  UntypedFormGroup,
-  UntypedFormBuilder,
-  Validators,
-  UntypedFormControl,
-  ReactiveFormsModule
-} from '@angular/forms';
-import { ActivatedRoute, Router, RouterLink } from '@angular/router';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormControl } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
 import { LoansService } from 'app/loans/loans.service';
@@ -77,6 +71,8 @@ export class MakeRepaymentComponent implements OnInit {
    */
   ngOnInit() {
     this.command = this.dataObject.type.code.split('.')[1];
+    console.log(this.command);
+    console.log(this.dataObject.type);
     this.maxDate = this.settingsService.businessDate;
     this.createRepaymentLoanForm();
     this.setRepaymentLoanDetails();
diff --git a/src/app/loans/loans-view/loans-view.component.ts b/src/app/loans/loans-view/loans-view.component.ts
index 8e65bdbc7..7a1edb4c0 100644
--- a/src/app/loans/loans-view/loans-view.component.ts
+++ b/src/app/loans/loans-view/loans-view.component.ts
@@ -183,16 +183,18 @@ export class LoansViewComponent implements OnInit {
         taskPermissionName: 'DISBURSE_LOAN'
       });
     } else if (this.status === 'Active') {
-      this.buttonConfig.addButton({
-        name: 'Buy Down Fee',
-        icon: 'plus',
-        taskPermissionName: 'BUY_DOWN_FEE_LOAN'
-      });
+      if (this.loanDetailsData.enableBuyDownFee) {
+        this.buttonConfig.addButton({
+          name: 'Buy Down Fee',
+          icon: 'plus',
+          taskPermissionName: 'BUYDOWNFEE_LOAN'
+        });
+      }
       if (this.loanDetailsData.enableIncomeCapitalization) {
         this.buttonConfig.addButton({
           name: 'Capitalized Income',
           icon: 'coins',
-          taskPermissionName: 'CAPITALIZED_INCOME_LOAN'
+          taskPermissionName: 'CAPITALIZEDINCOME_LOAN'
         });
       }
 
diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html
index 5839990dc..a8a24fa99 100644
--- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html
+++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html
@@ -197,7 +197,7 @@
           <span *ngIf="isCapitalizedIncome(transaction.type) && !transaction.manuallyReversed">
             <button
               mat-menu-item
-              *mifosxHasPermission="'CAPITALIZED_INCOME_LOAN'"
+              *mifosxHasPermission="'CAPITALIZEDINCOME_LOAN'"
               (click)="capitalizedIncomeAdjustmentTransaction(transaction, $event)"
             >
               <mat-icon><fa-icon icon="coins" size="sm"></fa-icon></mat-icon>
@@ -207,7 +207,7 @@
           <span *ngIf="isBuyDownFee(transaction.type) && !transaction.manuallyReversed">
             <button
               mat-menu-item
-              *mifosxHasPermission="'BUY_DOWN_FEE_LOAN'"
+              *mifosxHasPermission="'BUYDOWNFEE_LOAN'"
               (click)="buyDownFeeAdjustmentTransaction(transaction, $event)"
             >
               <mat-icon><fa-icon icon="coins" size="sm"></fa-icon></mat-icon>
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 5b8cba965..0aaf2025e 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
@@ -429,6 +429,10 @@ export class TransactionsTabComponent implements OnInit {
     return this.isReAmortize(transactionType) || this.isReAge(transactionType);
   }
 
+  isBuyDownFee(transactionType: LoanTransactionType): boolean {
+    return transactionType.buyDownFee || transactionType.code === 'loanTransactionType.buyDownFee';
+  }
+
   viewJournalEntry(transactionType: LoanTransactionType): boolean {
     return !(this.isReAmortize(transactionType) || this.isReAge(transactionType));
   }
@@ -446,6 +450,70 @@ export class TransactionsTabComponent implements OnInit {
     return true;
   }
 
+  buyDownFeeAdjustmentTransaction(transaction: LoanTransaction) {
+    const accountId = `${this.loanId}`;
+    this.loansService
+      .getLoanTransactionActionTemplate(accountId, 'buyDownFeeAdjustment', `${transaction.id}`)
+      .subscribe((response: any) => {
+        const transactionDate = response.date || transaction.date;
+        if (response.amount == 0) {
+          this.displayAlertMessage('Buy Down Fee amount adjusted already adjusted', transaction.amount);
+        } else {
+          const transactionAmount = response.amount || transaction.amount;
+          const formfields: FormfieldBase[] = [
+            new DatepickerBase({
+              controlName: 'transactionDate',
+              label: 'Date',
+              value: this.dateUtils.parseDate(transactionDate),
+              type: 'datetime-local',
+              required: true,
+              minDate: this.dateUtils.parseDate(transaction.date),
+              order: 1
+            }),
+            new InputBase({
+              controlName: 'amount',
+              label: 'Amount',
+              value: transactionAmount,
+              type: 'number',
+              required: true,
+              max: transactionAmount,
+              min: 0.001,
+              order: 2
+            })
+
+          ];
+          const data = {
+            title: `Adjustment ${transaction.type.value} Transaction`,
+            layout: { addButtonText: 'Adjustment' },
+            formfields: formfields
+          };
+          const chargebackDialogRef = this.dialog.open(FormDialogComponent, { data });
+          chargebackDialogRef.afterClosed().subscribe((response: { data: any }) => {
+            if (response.data) {
+              const dateFormat = this.settingsService.dateFormat;
+
+              if (response.data.value.amount <= transactionAmount) {
+                const locale = this.settingsService.language.code;
+                const payload = {
+                  transactionDate: this.dateUtils.formatDate(response.data.value.transactionDate, dateFormat),
+                  transactionAmount: response.data.value.amount,
+                  locale,
+                  dateFormat
+                };
+                this.loansService
+                  .executeLoansAccountTransactionsCommand(accountId, 'buyDownFeeAdjustment', payload, transaction.id)
+                  .subscribe(() => {
+                    this.reload();
+                  });
+              } else {
+                this.displayAlertMessage('Buy Down Fee Adjustment amount must be lower or equal to', transactionAmount);
+              }
+            }
+          });
+        }
+      });
+  }
+
   capitalizedIncomeAdjustmentTransaction(transaction: LoanTransaction) {
     const accountId = `${this.loanId}`;
     this.loansService
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index f373e63ec..ec0681d29 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -2522,8 +2522,8 @@
       "Block Deposit": "Blockeinzahlung",
       "Block Withdrawal": "Auszahlung blockieren",
       "Breadcrumbs": "Semmelbrösel",
-      "Buy Down Fee": "Ankaufsgebühr",
-      "Buy Down Fee Adjustment": "Anpassung der Ankaufsgebühr",
+      "Buy Down Fee": "Anzahlungsgebühr",
+      "Buy Down Fee Adjustment": "Anpassung der Buy-Down-Gebühr",
       "Calculate Interest": "Zinsen berechnen",
       "Capitalized Income": "Kapitalisiertes Einkommen",
       "Capitalized Income Adjustment": "Anpassung des kapitalisierten Einkommens",
diff --git a/src/assets/translations/es-CL.json b/src/assets/translations/es-CL.json
index 0980b6a10..884e336cc 100644
--- a/src/assets/translations/es-CL.json
+++ b/src/assets/translations/es-CL.json
@@ -2523,7 +2523,7 @@
       "Block Withdrawal": "Bloquear retiros",
       "Breadcrumbs": "Migas de pan",
       "Buy Down Fee": "Comisión de compra inicial",
-      "Buy Down Fee Adjustment": "Ajuste de la tasa de recompra",
+      "Buy Down Fee Adjustment": "Ajuste de la comisión de compra",
       "Calculate Interest": "Calcular interés",
       "Capitalized Income": "Ingreso capitalizado",
       "Capitalized Income Adjustment": "Ajuste de ingresos capitalizados",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index d82e7cdff..6d08d88b0 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -2523,7 +2523,7 @@
       "Block Withdrawal": "Bloquear retiros",
       "Breadcrumbs": "Migas de pan",
       "Buy Down Fee": "Comisión de compra inicial",
-      "Buy Down Fee Adjustment": "Ajuste de la tasa de recompra",
+      "Buy Down Fee Adjustment": "Ajuste de la comisión de compra",
       "Calculate Interest": "Calcular interés",
       "Capitalized Income": "Ingreso capitalizado",
       "Capitalized Income Adjustment": "Ajuste de ingresos capitalizados",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index 43dad107a..09f1ca8e0 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -2523,7 +2523,7 @@
       "Block Withdrawal": "Bloquer le retrait",
       "Breadcrumbs": "Chapelure",
       "Buy Down Fee": "Frais d'achat initial",
-      "Buy Down Fee Adjustment": "Ajustement de la commission de rachat",
+      "Buy Down Fee Adjustment": "Ajustement des frais d'achat",
       "Calculate Interest": "Calculer les intérêts",
       "Capitalized Income": "Revenu capitalisé",
       "Capitalized Income Adjustment": "Ajustement du revenu capitalisé",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index f40588557..18ec86974 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -2524,7 +2524,7 @@
       "Block Withdrawal": "출금 차단",
       "Breadcrumbs": "빵 부스러기",
       "Buy Down Fee": "구매 수수료",
-      "Buy Down Fee Adjustment": "바이 다운 수수료 조정",
+      "Buy Down Fee Adjustment": "매수 수수료 조정",
       "Calculate Interest": "이자 계산",
       "Capitalized Income": "자본화 소득",
       "Capitalized Income Adjustment": "자본화 소득 조정",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index d6a926c3a..622dea027 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -2523,7 +2523,7 @@
       "Block Withdrawal": "Blokuoti išėmimą",
       "Breadcrumbs": "Duonos trupiniai",
       "Buy Down Fee": "Pirkimo mokestis",
-      "Buy Down Fee Adjustment": "Išpirkimo mokesčio koregavimas",
+      "Buy Down Fee Adjustment": "Nupirkimo mokesčio koregavimas",
       "Calculate Interest": "Apskaičiuokite palūkanas",
       "Capitalized Income": "Kapitalizuotos pajamos",
       "Capitalized Income Adjustment": "Kapitalizuotų pajamų koregavimas",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index dd2f4b876..2a7655510 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -2523,7 +2523,7 @@
       "Block Withdrawal": "Bloķēt izņemšanu",
       "Breadcrumbs": "Maizes drupačas",
       "Buy Down Fee": "Nopirkt Down Fee",
-      "Buy Down Fee Adjustment": "Izpirkšanas maksas korekcija",
+      "Buy Down Fee Adjustment": "Pirkšanas maksas korekcija",
       "Calculate Interest": "Aprēķināt procentus",
       "Capitalized Income": "Kapitalizētie ienākumi",
       "Capitalized Income Adjustment": "Kapitalizēto ienākumu korekcija",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index dad19ca13..b9d02d7f7 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -2523,7 +2523,7 @@
       "Block Withdrawal": "ब्लक निकासी",
       "Breadcrumbs": "ब्रेडक्रम्ब्स",
       "Buy Down Fee": "खरिद डाउन शुल्क",
-      "Buy Down Fee Adjustment": "खरिद शुल्क समायोजन",
+      "Buy Down Fee Adjustment": "डाउन शुल्क समायोजन किन्नुहोस्",
       "Calculate Interest": "ब्याज गणना गर्नुहोस्",
       "Capitalized Income": "पुँजीगत आय",
       "Capitalized Income Adjustment": "पूंजीकृत आय समायोजन",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index fa3a9bdc1..930230647 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -2523,7 +2523,7 @@
       "Block Withdrawal": "Retirada de bloco",
       "Breadcrumbs": "Migalhas de pão",
       "Buy Down Fee": "Taxa de compra inicial",
-      "Buy Down Fee Adjustment": "Ajuste da taxa de compra",
+      "Buy Down Fee Adjustment": "Ajuste de taxa de compra para baixo",
       "Calculate Interest": "Calcular juros",
       "Capitalized Income": "Renda Capitalizada",
       "Capitalized Income Adjustment": "Ajuste de Renda Capitalizada",