Added repeat registration check