UP-4054:  Bug in the reset-password flow that renders it unusable