LPS-37055 Create tokens in session only when required