Reset Password and pre-search and search fixes