Fix custom fields on signup form

3 jobs for !2153 with 1920-additional-fields-not-showing-up-on-signup-form in 6 minutes and 20 seconds (queued for 4 seconds)
latest merge request