Fixed bug with email format