Should be fixed if/when https://forum.xwiki.org/t/proposal-for-a-better-registration-process/13805/12 is accepted/implemented.