Reset Password Fix

BH-278

I QA'd this locally. Discussed with Arjun and there are no tests in this ancient version of clearance, and we can't use their master.

After I merge this we are going to move our master to "old-master", and make this branch master