email changes and validation

merge the code with prabhat sir and reduce the code of email and
validation changes.