Refactor registering external repositories

[Kipok]

I'm still a little confused why the double trigger occurs, but I think what you've said in the last comment here seems like a good solution.

Originally posted by @gwarmstrong in #1240 (comment)