Revise registration form to a two-step process