diff --git a/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.ts b/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.ts
index 68b30374f..3e246b168 100644
--- a/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.ts
+++ b/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.ts
@@ -42,7 +42,7 @@ export class SharesAccountChargesStepComponent implements OnInit, OnChanges {
   /**
    * @param {MatDialog} dialog Mat Dialog
    */
-  constructor(public dialog: MatDialog) {}
+  constructor(public dialog: MatDialog) { }
 
   ngOnInit() {
     this.currencyCode.valueChanges.subscribe(() => {
@@ -57,7 +57,8 @@ export class SharesAccountChargesStepComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     if (this.sharesAccountProductTemplate) {
-      this.chargeData = this.sharesAccountProductTemplate.charges;
+      this.chargeData = this.sharesAccountTemplate.chargeOptions;
+      this.chargesDataSource = this.sharesAccountProductTemplate.charges;
     }
   }