Fix self-registering to work if added by hand