Yes, and obedience, something which Adam couldn't yet muster, is only authentic, and consistent, when we love. Once we love we obey naturally, and for the right reason. Our justice is then intact.
And this, BTW, is why the Greatest Commandments are what they are, because they define man's justice or righteousness. Man isn't meant to merely obey God's commands (which he can't do perfectly on his own anyway), rather man is meant to love God and neighbor, whereby the law is automatically fulfilled. I appreciate the way Basil of Cesarea, a 3rd century believer, put it:
"If we turn away from evil out of fear of punishment, we are in the position of slaves. If we pursue the enticement of wages, . . . we resemble mercenaries. Finally if we obey for the sake of the good itself and out of love for him who commands . . . we are in the position of children."