Tweaks to login / logout