Feature/fix password reset