Updated user session handling