Reset password bug fixes