This probably needs calling in a few places, especially when the currently logged in user changes while the session is hanging around.