fix email leakage