Improve logout redirect