Fixes for password reset

Luis found issues with the password reset form, fixed and retesting