build 844 Fix Email Address format checking