Fix email issie