Fixed primaryAddress registration