Rohan, Arathy | #2353 Fix the bug for mandatory fields