Fixes on new registerations