Reset Client Password Fix

BH-#278
Closes #6