Mihir|#1963|Added save button validation