Not yet tested changes in setup to reset passwords