diff --git a/src/app/loans/create-loans-account/create-loans-account.component.ts b/src/app/loans/create-loans-account/create-loans-account.component.ts
index c1e6e8974..e8ce57038 100644
--- a/src/app/loans/create-loans-account/create-loans-account.component.ts
+++ b/src/app/loans/create-loans-account/create-loans-account.component.ts
@@ -95,8 +95,7 @@ export class CreateLoansAccountComponent implements OnInit {
   get loansAccountFormValid() {
     return (
       this.loansAccountDetailsForm.valid &&
-      this.loansAccountTermsForm.valid &&
-      this.loansAccountChargesStep.loansAccountCharges.isValid
+      this.loansAccountTermsForm.valid
     );
   }
 
diff --git a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html
index 2cfe85aab..ed18669b2 100644
--- a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html
+++ b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html
@@ -174,7 +174,7 @@
     <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
     Previous
   </button>
-  <button mat-raised-button matStepperNext [disabled]="!isCollateralSufficient">
+  <button mat-raised-button matStepperNext [disabled]="!loansAccountFormValid">
     Next&nbsp;&nbsp;
     <fa-icon icon="arrow-right"></fa-icon>
   </button>
diff --git a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts
index 399f9002b..c0553a86c 100644
--- a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts
+++ b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts
@@ -69,7 +69,7 @@ export class LoansAccountChargesStepComponent implements OnInit, OnChanges {
   }
 
   ngOnInit() {
-    if ( this.loansAccountTemplate.charges) {
+    if (this.loansAccountTemplate.charges) {
       this.chargesDataSource = this.loansAccountTemplate.charges.map((charge: any) => ({ ...charge, id: charge.chargeId })) || [];
     }
   }
@@ -231,7 +231,7 @@ export class LoansAccountChargesStepComponent implements OnInit, OnChanges {
 
         this.totalCollateralValue += collateralData.type.pctToBase * collateralData.type.basePrice * collateralData.value / 100;
         this.collateralDataSource = this.collateralDataSource.concat(collateralData);
-        this.collateralOptions = this.collateralOptions.filter( (user: any) => user.collateralId !== response.data.value.collateral.collateralId);
+        this.collateralOptions = this.collateralOptions.filter((user: any) => user.collateralId !== response.data.value.collateral.collateralId);
         if (this.loanPrincipal < this.totalCollateralValue) {
           this.isCollateralSufficient = true;
         } else {
@@ -270,8 +270,7 @@ export class LoansAccountChargesStepComponent implements OnInit, OnChanges {
   get loansAccountCharges() {
     return {
       charges: this.chargesDataSource,
-      collateral: this.collateralDataSource,
-      isValid: this.isCollateralSufficient
+      collateral: this.collateralDataSource
     };
   }