Merge pull request #16929 from Mangesh-Khairnar/email-address-fix

refactor: change validate email add to validate email address