change create session behaviour