[refs pivotaltracker:68490222] Added form validation