diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
index 48077bd89ae2f510b2e93e81dc25f257f22a93b9..9c3a74330b19ffee499aa09e06cbf530302db174 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
@@ -765,7 +765,12 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 									_this._dataSetFormModel.dataSet.properties[propertyTypeCode] = $(field.children()[0]).children()[0].checked;
 								} else if (propertyType.dataType === "TIMESTAMP" || propertyType.dataType === "DATE") {
 									var timeValue = $($(field.children()[0]).children()[0]).val();
-									_this._dataSetFormModel.dataSet.properties[propertyTypeCode] = timeValue;
+                                    var isValidValue = Util.isDateValid(timeValue, propertyType.dataType === "DATE");
+                                    if(!isValidValue.isValid) {
+                                        Util.showUserError(isValidValue.error);
+                                    } else {
+                                        _this._dataSetFormModel.dataSet.properties[propertyTypeCode] = timeValue;
+                                    }
 								} else {
 									if(newValue !== undefined && newValue !== null) {
 										_this._dataSetFormModel.dataSet.properties[propertyTypeCode] = Util.getEmptyIfNull(newValue);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
index bdb5057b5886acf3dfbd9719b59648f45652e9d3..bd4ee74001205383b908b335a6361f4212bde1da 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
@@ -543,7 +543,12 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
 								_this._experimentFormModel.experiment.properties[propertyTypeCode] = $(field.children()[0]).children()[0].checked;
 							} else if (propertyType.dataType === "TIMESTAMP" || propertyType.dataType === "DATE") {
 								var timeValue = $($(field.children()[0]).children()[0]).val();
-								_this._experimentFormModel.experiment.properties[propertyTypeCode] = timeValue;
+								var isValidValue = Util.isDateValid(timeValue, propertyType.dataType === "DATE");
+								if(!isValidValue.isValid) {
+								    Util.showUserError(isValidValue.error);
+								} else {
+								    _this._experimentFormModel.experiment.properties[propertyTypeCode] = timeValue;
+								}
 							} else {
 								if(newValue !== undefined && newValue !== null) {
 									_this._experimentFormModel.experiment.properties[propertyTypeCode] = Util.getEmptyIfNull(newValue);