diff --git a/projects/common/components/ui-elements/text-field-simple.component.ts b/projects/common/components/ui-elements/text-field-simple.component.ts
index fd73a4e8dfe4ed076327994bec31cc5a92a989d4..f1b539910a4c9d3b8a531daecb65fff8864b1455 100644
--- a/projects/common/components/ui-elements/text-field-simple.component.ts
+++ b/projects/common/components/ui-elements/text-field-simple.component.ts
@@ -17,7 +17,7 @@ import { TextFieldSimpleElement } from '../../interfaces/elements';
            [style.text-decoration]="elementModel.styles.underline ? 'underline' : ''"
            [readonly]="elementModel.readOnly"
            [formControl]="elementFormControl"
-           value="{{elementModel.value}}">
+           [value]="elementModel.value">
   `,
   styles: [
     'input {border: 1px solid rgba(0,0,0,.12); border-radius: 5px}'
diff --git a/projects/common/components/ui-elements/text-field.component.ts b/projects/common/components/ui-elements/text-field.component.ts
index c14cc498fa47c0826b334c0154e60a637cee2d5a..90885d18e4968c5bc6595996df3a5de00583860b 100644
--- a/projects/common/components/ui-elements/text-field.component.ts
+++ b/projects/common/components/ui-elements/text-field.component.ts
@@ -22,7 +22,7 @@ import { TextFieldElement } from '../../interfaces/elements';
       <mat-label>{{elementModel.label}}</mat-label>
       <input matInput type="text" #input autocomplete="off"
              [formControl]="elementFormControl"
-             value="{{elementModel.value}}"
+             [value]="elementModel.value"
              [pattern]="elementModel.pattern"
              [readonly]="elementModel.readOnly"
              (focus)="elementModel.inputAssistancePreset !== 'none' ? onFocusChanged.emit(input) : null"
@@ -51,7 +51,7 @@ import { TextFieldElement } from '../../interfaces/elements';
         [appearance]="$any(elementModel.appearance)">
       <input matInput type="text" #input autocomplete="off"
              [formControl]="elementFormControl"
-             [value]="$any(elementModel.value)"
+             [value]="elementModel.value"
              [readonly]="elementModel.readOnly"
              [pattern]="elementModel.pattern"
              (focus)="elementModel.inputAssistancePreset !== 'none' ? onFocusChanged.emit(input) : null"
diff --git a/projects/common/directives/form-element-component.directive.ts b/projects/common/directives/form-element-component.directive.ts
index 6de0d27beaa6d9ddb194e18efbd12b1a69b2fca3..8a833fd3238b45c28fc25ef0f12ea59b7c6c6ac3 100644
--- a/projects/common/directives/form-element-component.directive.ts
+++ b/projects/common/directives/form-element-component.directive.ts
@@ -8,8 +8,8 @@ export abstract class FormElementComponent extends ElementComponent implements O
   elementFormControl!: FormControl;
 
   ngOnInit(): void {
-    this.elementFormControl = (this.parentForm) ?
+    this.elementFormControl = this.parentForm ?
       this.parentForm.controls[this.elementModel.id] as FormControl :
-      new FormControl({});
+      new FormControl(this.elementModel.value);
   }
 }