Added ability to disable registration