Ensure all user address keys are set. CLoses #1641