MT#6969 Fix sync logic on registration.