Improve registration form handling

Still not actually a form but slightly better now