Another attempt at fixing Guest reg.

Break the check into two checks.  One for the regular field names.  Another for the underscore fieldnames.

Fingers crossed.