self-signup template customer location fields, #940, #22084