I believe that https://forum.xwiki.org/t/proposal-for-a-better-registration-process/13805/13 would fix this issue.