CS-5434 - improve password recovery