diff --git a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html
index a7332a91a..50f521bae 100644
--- a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html
+++ b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html
@@ -68,7 +68,7 @@
             <input matInput formControlName="externalId" />
           </mat-form-field>
 
-          <mat-form-field *ngIf="isCapitalizedIncome()">
+          <mat-form-field *ngIf="isCapitalizedIncome() || isBuyDownFee()">
             <mat-label>{{ 'labels.inputs.Classification' | translate }}</mat-label>
             <mat-select formControlName="classificationId">
               <mat-option *ngFor="let classificationOption of classificationOptions" [value]="classificationOption.id">
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 8cbd1541d..d19035350 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
@@ -104,7 +104,6 @@ export class MakeRepaymentComponent implements OnInit {
           Validators.min(0.001),
           Validators.max(this.dataObject.amount)])
       );
-      this.repaymentLoanForm.addControl('classificationId', new UntypedFormControl(''));
     } else {
       this.repaymentLoanForm.addControl(
         'transactionAmount',
@@ -113,6 +112,9 @@ export class MakeRepaymentComponent implements OnInit {
           Validators.min(0.001)])
       );
     }
+    if (this.isCapitalizedIncome() || this.isBuyDownFee()) {
+      this.repaymentLoanForm.addControl('classificationId', new UntypedFormControl(''));
+    }
   }
 
   setRepaymentLoanDetails() {
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 e5e61c846..aabcbf988 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
@@ -263,6 +263,7 @@ export class TransactionsTabComponent implements OnInit {
       29,
       30,
       31,
+      32,
       33,
       35,
       37,
diff --git a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
index f1d50ce24..e0e80ef22 100644
--- a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
+++ b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
@@ -86,7 +86,7 @@
           {{ 'Classification' | translateKey: 'catalogs' }}
         </div>
 
-        <div class="flex-50" *ngIf="transactionData.classification">
+        <div class="flex-50 wrap-content" *ngIf="transactionData.classification">
           {{ transactionData.classification.name }}
         </div>
 
diff --git a/src/app/shared/external-identifier/external-identifier.component.html b/src/app/shared/external-identifier/external-identifier.component.html
index 8eb86eced..55899e321 100644
--- a/src/app/shared/external-identifier/external-identifier.component.html
+++ b/src/app/shared/external-identifier/external-identifier.component.html
@@ -6,7 +6,7 @@
     ><fa-icon icon="eye" size="sm" [title]="externalId"></fa-icon
   ></span>
   <span class="m-l-5" *ngIf="!completed" (click)="showValue()">{{ externalId | externalIdentifier }}</span>
-  <span class="m-l-5" *ngIf="completed" (click)="showValue()">{{ externalId }}</span>
+  <span *ngIf="completed" (click)="showValue()">{{ externalId }}</span>
   <span class="m-l-5" *ngIf="displayR && !completed && iconVisible && isLongValue()" (click)="showValue()"
     ><fa-icon icon="eye" size="sm" [title]="externalId"></fa-icon
   ></span>
diff --git a/src/assets/styles/_text.scss b/src/assets/styles/_text.scss
index 70360c479..c9dc45fa1 100644
--- a/src/assets/styles/_text.scss
+++ b/src/assets/styles/_text.scss
@@ -250,3 +250,8 @@ body {
 .label-field {
   margin-top: 32px;
 }
+
+.wrap-content {
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+}