diff --git a/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance-dialog.component.ts b/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance-dialog.component.ts
index c4fee6200..0b36ef5cf 100644
--- a/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance-dialog.component.ts
+++ b/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance-dialog.component.ts
@@ -19,8 +19,9 @@ import { TransferCashBalanceDialogParams } from './interfaces/interfaces';
     templateUrl: 'transfer-cash-balance-dialog.html'
 })
 export class TransferCashBalanceDialog implements OnDestroy {
-    public transferCashBalanceForm: FormGroup;
     public accounts: AccountModel[] = [];
+    public currency = '';
+    public transferCashBalanceForm: FormGroup;
 
     private unsubscribeSubject = new Subject<void>();
 
@@ -39,6 +40,10 @@ export class TransferCashBalanceDialog implements OnDestroy {
             fromAccount: ['', Validators.required],
             toAccount: ['', Validators.required],
         });
+
+        this.transferCashBalanceForm.get('fromAccount').valueChanges.subscribe((id) => {
+            this.currency = this.accounts.find((account) => account.id === id).currency;
+        })
     }
 
     public onCancel() {
@@ -48,11 +53,11 @@ export class TransferCashBalanceDialog implements OnDestroy {
     public onSubmit() {
         const account: TransferCashBalanceDto = {
             balance: this.transferCashBalanceForm.controls['balance'].value,
-            fromAccount: this.transferCashBalanceForm.controls['fromAccount'].value,
-            toAccount: this.transferCashBalanceForm.controls['toAccount'].value,
+            accountIdFrom: this.transferCashBalanceForm.controls['fromAccount'].value,
+            accountIdTo: this.transferCashBalanceForm.controls['toAccount'].value,
         };
 
-        console.log(`Transfer cash balance of ${account.balance} from account ${account.fromAccount} to account ${account.toAccount}`)
+        console.log(`Transfer cash balance of ${account.balance} from account ${account.accountIdFrom} to account ${account.accountIdTo}`)
 
         this.dialogRef.close({ account });
     }
diff --git a/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance-dialog.html b/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance-dialog.html
index 6a96d4560..8fe83a197 100644
--- a/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance-dialog.html
+++ b/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance-dialog.html
@@ -9,8 +9,8 @@
     <div>
         <mat-form-field appearance="outline" class="w-100">
           <mat-label i18n>Value</mat-label>
-          <input formControlName="balance" matInput type="number" />
-          <span class="ml-2" matTextSuffix>CHF</span>
+          <input formControlName="balance" matInput type="number" (keydown.enter)="$event.stopPropagation()" />
+          <span class="ml-2" matTextSuffix>{{ currency }}</span>
         </mat-form-field>
       </div>
     <div>
@@ -35,7 +35,7 @@
     </div>
   </div>
   <div class="justify-content-end" mat-dialog-actions>
-    <button i18n mat-button (click)="onCancel()">Cancel</button>
+    <button i18n mat-button (click)="onCancel()" type="button">Cancel</button>
     <button
       color="primary"
       mat-flat-button
diff --git a/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance.module-dialog.ts b/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance.module-dialog.ts
deleted file mode 100644
index 0e3e4667f..000000000
--- a/apps/client/src/app/pages/accounts/transfer-cash-balance/transfer-cash-balance.module-dialog.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatDialogModule } from '@angular/material/dialog';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { MatSelectModule } from '@angular/material/select';
-
-import { TransferCashBalanceDialog } from './transfer-cash-balance-dialog.component';
-
-@NgModule({
-    declarations: [TransferCashBalanceDialog],
-    imports: [
-        CommonModule,
-        FormsModule,
-        MatButtonModule,
-        MatCheckboxModule,
-        MatDialogModule,
-        MatFormFieldModule,
-        MatInputModule,
-        MatSelectModule,
-        ReactiveFormsModule
-    ]
-})
-export class GfTransferCashBalanceDialogModule { }