Fix self-reg of multiple unverified devices