Add further email address format checking