Tuned up the 'logged in as' / 'not logged in' ...