Email validation and fixing update bug