Tweaking to allow already being logged in