Ah yes, now i get it .. The easiest way to do that is hijaack one of the 5 extra user fields and then conditional on that.
I think i had to do that for a coupla sites. At least option #1 of yours.
Option #2 would be a little more work, but same idea -- maybe you'd grab another extra field or just combine those 2 options into one field.
