Updated Account module - added JS validation