Slight tweak to the session handling to account for multiple users