Fix bypass email not taken into account