Fix User Opt-In form (simplify code)