Improve checking and error handling for child account registration;
resolves #1101