Changed email format to conform with standard