diff --git a/projects/ajsf-core/src/lib/json-schema-form.service.ts b/projects/ajsf-core/src/lib/json-schema-form.service.ts
index a20eaa77..1d8b45e0 100755
--- a/projects/ajsf-core/src/lib/json-schema-form.service.ts
+++ b/projects/ajsf-core/src/lib/json-schema-form.service.ts
@@ -650,8 +650,8 @@ export class JsonSchemaFormService {
// Set value of current control
ctx.controlValue = value;
if (ctx.boundControl) {
- ctx.formControl.setValue(value);
ctx.formControl.markAsDirty();
+ ctx.formControl.setValue(value);
}
ctx.layoutNode.value = value;
diff --git a/projects/ajsf-core/src/lib/widget-library/input.component.ts b/projects/ajsf-core/src/lib/widget-library/input.component.ts
index 929089b0..bf15480a 100755
--- a/projects/ajsf-core/src/lib/widget-library/input.component.ts
+++ b/projects/ajsf-core/src/lib/widget-library/input.component.ts
@@ -26,7 +26,8 @@ import { JsonSchemaFormService } from '../json-schema-form.service';
[id]="'control' + layoutNode?._id"
[name]="controlName"
[readonly]="options?.readonly ? 'readonly' : null"
- [type]="layoutNode?.type">
+ [type]="layoutNode?.type"
+ (focusin)="updateValue($event)">
+ (input)="updateValue($event)"
+ (focusin)="updateValue($event)">