issue #15504: Make registration work in all editions
Merge pull request #10 from jrogelstad/15504

issue #15504: Make registration work in all editions