PR feedback
Merge pull request #5627 from edx/cdodge/touchups-on-auto-registration

PR feedback