Finished changes for lost password need to regenerate activation token on each attempt still but all is working good so far