Revert "Revert "Added repeat registration check""

This reverts commit 5059212960252400509171bb891d09a9581ef6f5.
Revert "Revert "what""

This reverts commit 9eac73d1ca337ac709622d2386ec2cf204e9140e.