Improvements to relogin system