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 e314e704e..2788200b7 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
@@ -332,6 +332,12 @@
         <mat-label>Maximum allowed outstanding balance</mat-label>
         <input matInput required formControlName="loanTermFrequency">
       </mat-form-field>
+      <span fxFlex>
+        <button type="button" mat-icon-button color="primary" (click)="addDisbursementDataEntry(disbursementData)">
+          <fa-icon icon="plus-circle" size="lg"></fa-icon>
+        </button>
+      </span>
+
       <div fxFlexFill fxLayout="row wrap" fxLayout.lt-md="column" formArrayName="disbursementData"
           *ngFor="let item of disbursementData.controls; let i = index;">
 
@@ -357,12 +363,9 @@
             </mat-form-field>
 
             <span fxFlex>
-              <button *ngIf="i !== 0" type="button" mat-icon-button (click)="removeDisbursementDataEntry(disbursementData, i)">
+              <button type="button" mat-icon-button (click)="removeDisbursementDataEntry(disbursementData, i)">
                 <fa-icon icon="minus-circle" size="lg"></fa-icon>
               </button>
-              <button *ngIf="i === 0" type="button" mat-icon-button color="primary" (click)="addDisbursementDataEntry(disbursementData)">
-                <fa-icon icon="plus-circle" size="lg"></fa-icon>
-              </button>
             </span>
 
           </div>
diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
index 3cc57656e..aa09c912d 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
@@ -134,7 +134,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
       'numberOfRepayments': ['', Validators.required],
       'repaymentEvery': ['', Validators.required],
       'repaymentFrequencyType': ['', Validators.required],
-      'disbursementData': this.formBuilder.array([this.createDisbursementDataForm()]),
+      'disbursementData': this.formBuilder.array([]),
       'repaymentFrequencyNthDayType': [''],
       'repaymentFrequencyDayOfWeekType': [''],
       'repaymentsStartingFromDate': [''],