Updates to fix password reset