Cleaner logout on user settings save

see #270
update test mail

see #270