Made email generator consistant