Add validation to email address.
Merge commit '9adc61ca09d69903ed7f9a4dc0067f33fa395348'
Merge commit '9adc61ca09d69903ed7f9a4dc0067f33fa395348'
Merge commit '9adc61ca09d69903ed7f9a4dc0067f33fa395348t'