diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
index 7c0214a0f..35074ec97 100644
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
@@ -20,7 +20,7 @@
     <div>
       <mat-form-field appearance="outline" class="w-100">
         <mat-label i18n>Currency</mat-label>
-        <gf-currency-autocomplete
+        <gf-currency-selector
           formControlName="currency"
           [currencies]="currencies"
         />
diff --git a/libs/ui/src/lib/currency-selector/currency-selector.component.ts b/libs/ui/src/lib/currency-selector/currency-selector.component.ts
index fcbcd4b9b..f75b684dd 100644
--- a/libs/ui/src/lib/currency-selector/currency-selector.component.ts
+++ b/libs/ui/src/lib/currency-selector/currency-selector.component.ts
@@ -32,7 +32,7 @@ import { map, startWith, takeUntil } from 'rxjs/operators';
       useExisting: CurrencySelectorComponent
     }
   ],
-  selector: 'gf-currency-autocomplete',
+  selector: 'gf-currency-selector',
   styleUrls: ['./currency-selector.component.scss'],
   templateUrl: 'currency-selector.component.html'
 })
@@ -43,7 +43,7 @@ export class CurrencySelectorComponent
   @Input() private currencies: Currency[] = [];
   @Input() private formControlName: string;
 
-  @ViewChild(MatInput, { static: false }) private input: MatInput;
+  @ViewChild(MatInput) private input: MatInput;
 
   @ViewChild('currencyAutocomplete')
   public currencyAutocomplete: MatAutocomplete;
@@ -62,7 +62,7 @@ export class CurrencySelectorComponent
   ) {
     super(_elementRef, _focusMonitor, ngControl);
 
-    this.controlType = 'currency-autocomplete';
+    this.controlType = 'currency-selector';
   }
 
   public ngOnInit() {
diff --git a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
index 26b8cf59b..17cdb853d 100644
--- a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
+++ b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
@@ -53,7 +53,7 @@ export class SymbolAutocompleteComponent
   @Input() private includeIndices = false;
   @Input() public isLoading = false;
 
-  @ViewChild(MatInput, { static: false }) private input: MatInput;
+  @ViewChild(MatInput) private input: MatInput;
 
   @ViewChild('symbolAutocomplete') public symbolAutocomplete: MatAutocomplete;