Password reset

I just wondered whether it's worth splitting this out to some Utils class so you can test it explicitly?