Fix functionality to set the session by default