Form validation and error clearing

Change-Id: Ibbae526df77e2ce4d86d8e964275f593a80a2a71