LERGO-353 - fixing bug where users go back.