Active sessions stay active on page reload
Fixed merge conflicts