Revisiting registration form

Details
-------

Ticket
------