Fix Session.guess_user logic for override
Cleanup Session.guess_user a little