diff --git a/frontend/src/app/features/settings/pages/languages/language-add-form.component.html b/frontend/src/app/features/settings/pages/languages/language-add-form.component.html
index 83d28f754..f97b03f99 100644
--- a/frontend/src/app/features/settings/pages/languages/language-add-form.component.html
+++ b/frontend/src/app/features/settings/pages/languages/language-add-form.component.html
@@ -4,7 +4,7 @@
     <form [formGroup]="addLanguageForm.form" (ngSubmit)="addLanguage()">
         <div class="row gx-2">
             <div class="col">
-                <sqx-autocomplete formControlName="language" displayProperty="iso2Code" [source]="addLanguagesSource">
+                <sqx-autocomplete formControlName="language" displayProperty="iso2Code" valueProperty="iso2Code" [source]="addLanguagesSource">
                     <ng-template let-language="$implicit">
                         {{language.iso2Code}} ({{language.englishName}})
                     </ng-template>
diff --git a/frontend/src/app/framework/angular/forms/editors/autocomplete.component.ts b/frontend/src/app/framework/angular/forms/editors/autocomplete.component.ts
index cf77a3a63..6197b569d 100644
--- a/frontend/src/app/framework/angular/forms/editors/autocomplete.component.ts
+++ b/frontend/src/app/framework/angular/forms/editors/autocomplete.component.ts
@@ -63,6 +63,9 @@ export class AutocompleteComponent extends StatefulControlComponent<State, Reado
     @Input()
     public displayProperty = '';
 
+    @Input()
+    public valueProperty = '';
+
     @Input()
     public placeholder = '';
 
@@ -238,8 +241,8 @@ export class AutocompleteComponent extends StatefulControlComponent<State, Reado
 
             let value = selection;
 
-            if (this.displayProperty) {
-                value = selection[this.displayProperty];
+            if (this.valueProperty) {
+                value = selection[this.valueProperty];
             }
 
             this.callChange(value);