diff --git a/bizmatch/src/app/components/validated-input/validated-input.component.ts b/bizmatch/src/app/components/validated-input/validated-input.component.ts
index 2a06e98..981dccb 100644
--- a/bizmatch/src/app/components/validated-input/validated-input.component.ts
+++ b/bizmatch/src/app/components/validated-input/validated-input.component.ts
@@ -27,8 +27,8 @@ export class ValidatedInputComponent extends BaseInputComponent {
     super(validationMessagesService);
   }
 
-  onInputChange(event: Event): void {
-    this.value = event;
-    this.onChange(event);
+  onInputChange(event: string): void {
+    this.value = event?.length > 0 ? event : null;
+    this.onChange(this.value);
   }
 }
diff --git a/bizmatch/src/app/components/validated-location/validated-location.component.ts b/bizmatch/src/app/components/validated-location/validated-location.component.ts
index fdde13a..b52b162 100644
--- a/bizmatch/src/app/components/validated-location/validated-location.component.ts
+++ b/bizmatch/src/app/components/validated-location/validated-location.component.ts
@@ -41,16 +41,18 @@ export class ValidatedLocationComponent extends BaseInputComponent {
   }
   onInputChange(event: Place): void {
     this.value = event; //{ ...event, longitude: parseFloat(event.longitude), latitude: parseFloat(event.latitude) };
-    this.value = {
-      id: event?.place_id,
-      name: event?.address.city,
-      county: event?.address.county,
-      street: event?.address.road,
-      housenumber: event?.address.house_number,
-      state: event?.address['ISO3166-2-lvl4'].substr(3),
-      latitude: event ? parseFloat(event?.lat) : undefined,
-      longitude: event ? parseFloat(event?.lon) : undefined,
-    };
+    if (event) {
+      this.value = {
+        id: event?.place_id,
+        name: event?.address.city,
+        county: event?.address.county,
+        street: event?.address.road,
+        housenumber: event?.address.house_number,
+        state: event?.address['ISO3166-2-lvl4'].substr(3),
+        latitude: event ? parseFloat(event?.lat) : undefined,
+        longitude: event ? parseFloat(event?.lon) : undefined,
+      };
+    }
     this.onChange(this.value);
   }
   private loadCities() {
diff --git a/bizmatch/src/app/components/validated-price/validated-price.component.ts b/bizmatch/src/app/components/validated-price/validated-price.component.ts
index e515096..8c28cdd 100644
--- a/bizmatch/src/app/components/validated-price/validated-price.component.ts
+++ b/bizmatch/src/app/components/validated-price/validated-price.component.ts
@@ -29,6 +29,6 @@ export class ValidatedPriceComponent extends BaseInputComponent {
 
   onInputChange(event: Event): void {
     this.value = !event ? null : event;
-    this.onChange(event);
+    this.onChange(this.value);
   }
 }
diff --git a/bizmatch/src/app/components/validated-textarea/validated-textarea.component.ts b/bizmatch/src/app/components/validated-textarea/validated-textarea.component.ts
index 649e7c0..963eeda 100644
--- a/bizmatch/src/app/components/validated-textarea/validated-textarea.component.ts
+++ b/bizmatch/src/app/components/validated-textarea/validated-textarea.component.ts
@@ -23,8 +23,8 @@ export class ValidatedTextareaComponent extends BaseInputComponent {
     super(validationMessagesService);
   }
 
-  onInputChange(event: Event): void {
-    this.value = event;
+  onInputChange(event: string): void {
+    this.value = event?.length > 0 ? event : null;
     this.onChange(this.value);
   }
 }
diff --git a/bizmatch/src/app/pages/subscription/account/account.component.html b/bizmatch/src/app/pages/subscription/account/account.component.html
index 5abe3e1..c11d632 100644
--- a/bizmatch/src/app/pages/subscription/account/account.component.html
+++ b/bizmatch/src/app/pages/subscription/account/account.component.html
@@ -7,7 +7,7 @@
         <div class="md:col-span-2">
           <label for="email" class="block text-sm font-medium text-gray-700">E-mail (required)</label>
           <input type="email" id="email" name="email" [(ngModel)]="user.email" disabled class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500" />
-          <p class="text-xs text-gray-500 mt-1">You can only modify your email by contacting us at support&#64;bizwatch.net</p>
+          <p class="text-xs text-gray-500 mt-1">You can only modify your email by contacting us at support&#64;bizmatch.net</p>
         </div>
         @if (isProfessional || isAdmin()){
         <div class="flex flex-row items-center justify-around md:space-x-4">