Proposal for the changes: https://design.xwiki.org/xwiki/bin/view/Proposal/Registrationflowupdates