diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts
index e64daf14c..255e603de 100644
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts
@@ -103,7 +103,7 @@ export class CreateOrUpdateAccountDialog implements OnDestroy {
     this.dialogRef.close();
   }
 
-  public onSubmit() {
+  public async onSubmit() {
     const account: CreateAccountDto | UpdateAccountDto = {
       balance: this.accountForm.controls['balance'].value,
       comment: this.accountForm.controls['comment'].value,
@@ -116,19 +116,21 @@ export class CreateOrUpdateAccountDialog implements OnDestroy {
 
     if (this.data.account.id) {
       (account as UpdateAccountDto).id = this.data.account.id;
-      validateObjectForForm(account, UpdateAccountDto, this.accountForm).then(
-        () => {
-          this.dialogRef.close({ account });
-        }
-      );
+      await validateObjectForForm({
+        classDto: UpdateAccountDto,
+        form: this.accountForm,
+        object: account
+      });
     } else {
       delete (account as CreateAccountDto).id;
-      validateObjectForForm(account, CreateAccountDto, this.accountForm).then(
-        () => {
-          this.dialogRef.close({ account });
-        }
-      );
+      await validateObjectForForm({
+        classDto: CreateAccountDto,
+        form: this.accountForm,
+        object: account
+      });
     }
+
+    this.dialogRef.close({ account });
   }
 
   public ngOnDestroy() {
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
index 25264cb56..a84593b54 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
@@ -452,7 +452,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
     );
   }
 
-  public onSubmit() {
+  public async onSubmit() {
     const activity: CreateOrderDto | UpdateOrderDto = {
       accountId: this.activityForm.controls['accountId'].value,
       assetClass: this.activityForm.controls['assetClass'].value,
@@ -477,20 +477,22 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
 
     if (this.data.activity.id) {
       (activity as UpdateOrderDto).id = this.data.activity.id;
-      validateObjectForForm(activity, UpdateOrderDto, this.activityForm).then(
-        () => {
-          this.dialogRef.close({ activity });
-        }
-      );
+      await validateObjectForForm({
+        classDto: UpdateOrderDto,
+        form: this.activityForm,
+        object: activity as UpdateOrderDto
+      });
     } else {
       (activity as CreateOrderDto).updateAccountBalance =
         this.activityForm.controls['updateAccountBalance'].value;
-      validateObjectForForm(activity, CreateOrderDto, this.activityForm).then(
-        () => {
-          this.dialogRef.close({ activity });
-        }
-      );
+      await validateObjectForForm({
+        classDto: CreateOrderDto,
+        form: this.activityForm,
+        object: activity
+      });
     }
+
+    this.dialogRef.close({ activity });
   }
 
   public ngOnDestroy() {
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
index b868badb8..79ea7647a 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
@@ -153,11 +153,6 @@
       <mat-form-field appearance="outline" class="w-100">
         <mat-label i18n>Data Source</mat-label>
         <input formControlName="dataSource" matInput />
-        <mat-error
-          *ngIf="activityForm.controls['dataSource'].errors?.validationError"
-        >
-          {{ activityForm.controls['dataSource'].errors?.validationError }}
-        </mat-error>
       </mat-form-field>
     </div>
     <div class="mb-3">
@@ -227,6 +222,20 @@
               </mat-option>
             </mat-select>
           </div>
+          <mat-error
+            *ngIf="
+              activityForm.controls['unitPriceInCustomCurrency'].hasError(
+                'invalid'
+              )
+            "
+            ><ng-container i18n
+              >Oops! Could not get the historical exchange rate
+              from</ng-container
+            >
+            {{
+              activityForm.controls['date']?.value | date: defaultDateFormat
+            }}</mat-error
+          >
         </mat-form-field>
         <button
           *ngIf="
@@ -283,6 +292,17 @@
         >
           {{ activityForm.controls['currencyOfUnitPrice'].value }}
         </div>
+        <mat-error
+          *ngIf="
+            activityForm.controls['feeInCustomCurrency'].hasError('invalid')
+          "
+          ><ng-container i18n
+            >Oops! Could not get the historical exchange rate from</ng-container
+          >
+          {{
+            activityForm.controls['date']?.value | date: defaultDateFormat
+          }}</mat-error
+        >
       </mat-form-field>
     </div>
     <div class="d-none">
diff --git a/apps/client/src/app/util/form.util.ts b/apps/client/src/app/util/form.util.ts
index 5caa9c1c1..4a42e8829 100644
--- a/apps/client/src/app/util/form.util.ts
+++ b/apps/client/src/app/util/form.util.ts
@@ -2,18 +2,25 @@ import { FormGroup } from '@angular/forms';
 import { plainToInstance } from 'class-transformer';
 import { validate } from 'class-validator';
 
-export async function validateObjectForForm<T>(
-  object: T,
-  classDto: { new (): T },
-  form: FormGroup
-): Promise<void> {
+export async function validateObjectForForm<T>({
+  classDto,
+  form,
+  object
+}: {
+  classDto: { new (): T };
+  form: FormGroup;
+  object: T;
+}): Promise<void> {
   const objectInstance = plainToInstance(classDto, object);
   const errors = await validate(objectInstance as object);
 
-  if (errors.length === 0) return Promise.resolve();
+  if (errors.length === 0) {
+    return Promise.resolve();
+  }
 
   for (const error of errors) {
     const formControl = form.get(error.property);
+
     if (formControl) {
       formControl.setErrors({
         validationError: Object.values(error.constraints)[0]