diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 717aa88d44..404e851493 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -89,9 +89,8 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
       }
     }
 
-    this.maxYear = this.initialYear + 100;
-
-  }
+    this.maxYear = now.getUTCFullYear() + 100;
+    }
 
   onBlur(event) {
     this.blur.emit();
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index 82240c41d1..40562dd61c 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -103,13 +103,12 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
       if (i >= this.min && i <= this.max) {
         this.value = i;
-        this.emitChange();
       } else if (event.target.value === null || event.target.value === '') {
         this.value = null;
-        this.emitChange();
       } else {
         this.value = undefined;
       }
+      this.emitChange();
     } catch (e) {
       this.value = undefined;
     }