Revert "Revert "Closing registration""

This reverts commit 027def5252566c0bb9647375b3debc7a1f6b6a90.