Finished up lost password changes

Everything should work as expected, finished up some changes.