The first question is related to the second question in ethical systems in which you get credit for doing the right things. They should still be two separate questions.

In some types of Christianity, they aren't related, because there is no "right thing to do", there is only what God tells you to do. This is described as "the right thing to do", but it's what I called a macro rather than a primitive: There is no new ontological category of "right things"; you just need to learn what things God says to do.