diff --git a/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html b/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html
index 9dcdae33b..c01dbe3b3 100644
--- a/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html
+++ b/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html
@@ -162,7 +162,7 @@
 
   </div>
 
-  <div fxFlexFill *ngIf="client.address.length" fxLayout="row wrap" fxLayout.lt-md="column">
+  <div fxFlexFill *ngIf="clientTemplate.isAddressEnabled && client.address.length" fxLayout="row wrap" fxLayout.lt-md="column">
 
     <h3 class="mat-h3" fxFlexFill>Address</h3>
 
diff --git a/src/app/clients/clients-view/clients-view.component.html b/src/app/clients/clients-view/clients-view.component.html
index b70fca8a0..65ee287a4 100644
--- a/src/app/clients/clients-view/clients-view.component.html
+++ b/src/app/clients/clients-view/clients-view.component.html
@@ -120,7 +120,7 @@
         General
       </a>
       <a mat-tab-link [routerLink]="['./address']" routerLinkActive #address="routerLinkActive"
-        [active]="address.isActive" *ngIf="clientTemplateData.isAddressEnabled">
+        [active]="address.isActive">
         Address
       </a>
       <a mat-tab-link [routerLink]="['./family-members']" routerLinkActive #familyMembers="routerLinkActive"
diff --git a/src/app/clients/create-client/create-client.component.html b/src/app/clients/create-client/create-client.component.html
index e46d83844..cf5d38992 100644
--- a/src/app/clients/create-client/create-client.component.html
+++ b/src/app/clients/create-client/create-client.component.html
@@ -38,11 +38,11 @@
 
     </mat-step>
 
-    <mat-step>
+    <mat-step *ngIf="clientTemplate.isAddressEnabled">
 
       <ng-template matStepLabel>ADDRESS</ng-template>
 
-      <mifosx-client-address-step 
+      <mifosx-client-address-step
         [clientTemplate]="clientTemplate"
         [clientAddressFieldConfig]="clientAddressFieldConfig"
       >
diff --git a/src/app/clients/create-client/create-client.component.ts b/src/app/clients/create-client/create-client.component.ts
index e934d6b76..bf4b3e039 100644
--- a/src/app/clients/create-client/create-client.component.ts
+++ b/src/app/clients/create-client/create-client.component.ts
@@ -44,9 +44,9 @@ export class CreateClientComponent {
    * @param {SettingsService} settingsService Setting service
    */
   constructor(private route: ActivatedRoute,
-              private router: Router,
-              private clientsService: ClientsService,
-              private settingsService: SettingsService) {
+    private router: Router,
+    private clientsService: ClientsService,
+    private settingsService: SettingsService) {
     this.route.data.subscribe((data: { clientTemplate: any, clientAddressFieldConfig: any }) => {
       this.clientTemplate = data.clientTemplate;
       this.clientAddressFieldConfig = data.clientAddressFieldConfig;
@@ -64,11 +64,18 @@ export class CreateClientComponent {
    * Retrieves the client object
    */
   get client() {
-    return {
-      ...this.clientGeneralStep.clientGeneralDetails,
-      ...this.clientFamilyMembersStep.familyMembers,
-      ...this.clientAddressStep.address
-    };
+    if (this.clientTemplate.isAddressEnabled) {
+      return {
+        ...this.clientGeneralStep.clientGeneralDetails,
+        ...this.clientFamilyMembersStep.familyMembers,
+        ...this.clientAddressStep.address
+      };
+    } else {
+      return {
+        ...this.clientGeneralStep.clientGeneralDetails,
+        ...this.clientFamilyMembersStep.familyMembers
+      };
+    }
   }
   /**
    * Submits the create client form.