Added better FormValidator updating

Main code rev. 1939