More duplicate registration prevention