Nereid fixes after registration change #3429

Review ID: 1553001