Fixed a line that assumes that the registration was automatic, by making it more generic, to also for self-registration.