Small tweaks to better handl logouts and language changes