Improve password recover