Password reset fix merge

Merged my fixes into...merge so that it won't introduce new merge conflicts.