Fix join form validators