Password Resets almost complete