Additional bugfix on GENERATE-NEW-SESSION-TOKEN