Round 6 Extended 2

May be the last changes for the registration process.