[Felix,MJ] Modified the form handling for the signup form so that it can match locations in configurations that have no village location type.