No email flash + logout fix