Deductions & credits

So for the second 1098, I should say "yes" that I paid points and re-enter the amount paid AND I should also say "yes" to indicate it is the original loan used to purchase the home?