I too was offered the 20 nights / 35K points incentive. I sent an email asking for the 25/50K version (which I'll achieve comfortably) and received a very pleasant and helpful email back the same day to confirm.

I would never have thought of this if it hadn't been for this thread, so thanks very much to all the FTers who have contributed.