Re-add session persistance