client cleanup, Keep logged in localization fix (thanks Lemon!)