Continue work on password reset/recovery