fix #7629 restricting new registrations to those which make sense in the current...