Changed ugly email format