MIFOS-6013: Improve the Data Entry Validation