Email isset fixes