Improve registation controller logic