diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts b/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
index a0fde6db4..5552c08fa 100644
--- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
+++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts
@@ -7,7 +7,7 @@
  */
 
 /** Angular Imports */
-import { Component, OnInit, Input, Output, EventEmitter, inject } from '@angular/core';
+import { Component, OnInit, OnDestroy, Input, Output, EventEmitter, inject } from '@angular/core';
 import {
   UntypedFormBuilder,
   UntypedFormGroup,
@@ -15,6 +15,8 @@ import {
   UntypedFormControl,
   ReactiveFormsModule
 } from '@angular/forms';
+import { Subject } from 'rxjs';
+import { filter, switchMap, takeUntil } from 'rxjs/operators';
 import { ClientsService } from 'app/clients/clients.service';
 import { Dates } from 'app/core/utils/dates';
 
@@ -44,12 +46,15 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
     MatStepperNext
   ]
 })
-export class ClientGeneralStepComponent implements OnInit {
+export class ClientGeneralStepComponent implements OnInit, OnDestroy {
   private formBuilder = inject(UntypedFormBuilder);
   private dateUtils = inject(Dates);
   private settingsService = inject(SettingsService);
   private clientService = inject(ClientsService);
 
+  /** Subject to trigger unsubscription on destroy */
+  private destroy$ = new Subject<void>();
+
   @Output() legalFormChangeEvent = new EventEmitter<{ legalForm: number }>();
 
   /** Minimum date allowed. */
@@ -151,72 +156,91 @@ export class ClientGeneralStepComponent implements OnInit {
    * Adds controls conditionally.
    */
   buildDependencies() {
-    this.createClientForm.get('legalFormId').valueChanges.subscribe((legalFormId: number) => {
-      this.legalFormChangeEvent.emit({ legalForm: legalFormId });
-      if (legalFormId === 1) {
-        this.createClientForm.removeControl('fullname');
-        this.createClientForm.removeControl('clientNonPersonDetails');
-        this.createClientForm.addControl(
-          'firstname',
-          new UntypedFormControl('', [
-            Validators.required,
-            Validators.pattern('(^[A-z]).*')
-          ])
-        );
-        this.createClientForm.addControl('middlename', new UntypedFormControl('', Validators.pattern('(^[A-z]).*')));
-        this.createClientForm.addControl(
-          'lastname',
-          new UntypedFormControl('', [
-            Validators.required,
-            Validators.pattern('(^[A-z]).*')
-          ])
-        );
-      } else {
-        this.createClientForm.removeControl('firstname');
-        this.createClientForm.removeControl('middlename');
-        this.createClientForm.removeControl('lastname');
-        this.createClientForm.addControl(
-          'fullname',
-          new UntypedFormControl('', [
-            Validators.required,
-            Validators.pattern('(^[A-z]).*')
-          ])
-        );
-        this.createClientForm.addControl(
-          'clientNonPersonDetails',
-          this.formBuilder.group({
-            constitutionId: [
-              '',
-              Validators.required
-            ],
-            incorpValidityTillDate: [''],
-            incorpNumber: [''],
-            mainBusinessLineId: [''],
-            remarks: ['']
-          })
-        );
-      }
-    });
+    this.createClientForm
+      .get('legalFormId')
+      .valueChanges.pipe(takeUntil(this.destroy$))
+      .subscribe((legalFormId: number) => {
+        this.legalFormChangeEvent.emit({ legalForm: legalFormId });
+        if (legalFormId === 1) {
+          this.createClientForm.removeControl('fullname');
+          this.createClientForm.removeControl('clientNonPersonDetails');
+          this.createClientForm.addControl(
+            'firstname',
+            new UntypedFormControl('', [
+              Validators.required,
+              Validators.pattern('(^[A-z]).*')
+            ])
+          );
+          this.createClientForm.addControl('middlename', new UntypedFormControl('', Validators.pattern('(^[A-z]).*')));
+          this.createClientForm.addControl(
+            'lastname',
+            new UntypedFormControl('', [
+              Validators.required,
+              Validators.pattern('(^[A-z]).*')
+            ])
+          );
+        } else {
+          this.createClientForm.removeControl('firstname');
+          this.createClientForm.removeControl('middlename');
+          this.createClientForm.removeControl('lastname');
+          this.createClientForm.addControl(
+            'fullname',
+            new UntypedFormControl('', [
+              Validators.required,
+              Validators.pattern('(^[A-z]).*')
+            ])
+          );
+          this.createClientForm.addControl(
+            'clientNonPersonDetails',
+            this.formBuilder.group({
+              constitutionId: [
+                '',
+                Validators.required
+              ],
+              incorpValidityTillDate: [''],
+              incorpNumber: [''],
+              mainBusinessLineId: [''],
+              remarks: ['']
+            })
+          );
+        }
+      });
     this.createClientForm.get('legalFormId').patchValue(1);
-    this.createClientForm.get('active').valueChanges.subscribe((active: boolean) => {
-      if (active) {
-        this.createClientForm.addControl('activationDate', new UntypedFormControl('', Validators.required));
-      } else {
-        this.createClientForm.removeControl('activationDate');
-      }
-    });
-    this.createClientForm.get('addSavings').valueChanges.subscribe((active: boolean) => {
-      if (active) {
-        this.createClientForm.addControl('savingsProductId', new UntypedFormControl('', Validators.required));
-      } else {
-        this.createClientForm.removeControl('savingsProductId');
-      }
-    });
-    this.createClientForm.get('officeId').valueChanges.subscribe((officeId: number) => {
-      this.clientService.getClientWithOfficeTemplate(officeId).subscribe((clientTemplate: any) => {
+    this.createClientForm
+      .get('active')
+      .valueChanges.pipe(takeUntil(this.destroy$))
+      .subscribe((active: boolean) => {
+        if (active) {
+          this.createClientForm.addControl('activationDate', new UntypedFormControl('', Validators.required));
+        } else {
+          this.createClientForm.removeControl('activationDate');
+        }
+      });
+    this.createClientForm
+      .get('addSavings')
+      .valueChanges.pipe(takeUntil(this.destroy$))
+      .subscribe((active: boolean) => {
+        if (active) {
+          this.createClientForm.addControl('savingsProductId', new UntypedFormControl('', Validators.required));
+        } else {
+          this.createClientForm.removeControl('savingsProductId');
+        }
+      });
+    this.createClientForm
+      .get('officeId')
+      .valueChanges.pipe(
+        filter((officeId: number) => !!officeId),
+        switchMap((officeId: number) => this.clientService.getClientWithOfficeTemplate(officeId)),
+        takeUntil(this.destroy$)
+      )
+      .subscribe((clientTemplate: any) => {
         this.staffOptions = clientTemplate.staffOptions;
       });
-    });
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 
   getDateLabel(legalFormId: number, values: string[]): string {