diff --git a/src/app/clients/client-stepper/client-address-step/client-address-step.component.ts b/src/app/clients/client-stepper/client-address-step/client-address-step.component.ts
index 2e161c1f8..c4c5e57ef 100644
--- a/src/app/clients/client-stepper/client-address-step/client-address-step.component.ts
+++ b/src/app/clients/client-stepper/client-address-step/client-address-step.component.ts
@@ -199,6 +199,17 @@ export class ClientAddressStepComponent {
           })
         : null
     );
+    formfields.push(
+      this.isFieldEnabled('postalCode')
+        ? new InputBase({
+            controlName: 'postalCode',
+            label: this.translateService.instant('labels.inputs.Postal Code'),
+            value: address ? address.postalCode : '',
+            type: 'text',
+            order: 2
+          })
+        : null
+    );
     formfields.push(
       this.isFieldEnabled('street')
         ? new InputBase({
@@ -207,7 +218,7 @@ export class ClientAddressStepComponent {
             value: address ? address.street : '',
             type: 'text',
             required: true,
-            order: 2
+            order: 3
           })
         : null
     );
@@ -299,17 +310,6 @@ export class ClientAddressStepComponent {
           })
         : null
     );
-    formfields.push(
-      this.isFieldEnabled('postalCode')
-        ? new InputBase({
-            controlName: 'postalCode',
-            label: this.translateService.instant('labels.inputs.Postal Code'),
-            value: address ? address.postalCode : '',
-            type: 'text',
-            order: 11
-          })
-        : null
-    );
     formfields = formfields.filter((field) => field !== null);
     return formfields;
   }
diff --git a/src/app/clients/clients-view/address-tab/address-tab.component.ts b/src/app/clients/clients-view/address-tab/address-tab.component.ts
index b6ea092ed..1dcc4e36b 100644
--- a/src/app/clients/clients-view/address-tab/address-tab.component.ts
+++ b/src/app/clients/clients-view/address-tab/address-tab.component.ts
@@ -203,6 +203,17 @@ export class AddressTabComponent {
           : null
       );
     }
+    formfields.push(
+      this.isFieldEnabled('postalCode')
+        ? new InputBase({
+            controlName: 'postalCode',
+            label: this.translateService.instant('labels.inputs.Postal Code'),
+            value: address ? address.postalCode : '',
+            type: 'text',
+            order: 2
+          })
+        : null
+    );
     formfields.push(
       this.isFieldEnabled('street')
         ? new InputBase({
@@ -211,7 +222,7 @@ export class AddressTabComponent {
             value: address ? address.street : '',
             type: 'text',
             required: false,
-            order: 2
+            order: 3
           })
         : null
     );
@@ -303,17 +314,6 @@ export class AddressTabComponent {
           })
         : null
     );
-    formfields.push(
-      this.isFieldEnabled('postalCode')
-        ? new InputBase({
-            controlName: 'postalCode',
-            label: this.translateService.instant('labels.inputs.Postal Code'),
-            value: address ? address.postalCode : '',
-            type: 'text',
-            order: 11
-          })
-        : null
-    );
     formfields = formfields.filter((field) => field !== null);
     return formfields;
   }