header modified and email uniqueness added