Dave, your patch doesn't include the util_user_message call. I've just included it, but it's not working somehow. Take a look at how my patch is right now: http://pastebin.info/902
Torben, I'm also working on ad-page-contract. I'll probably insert the same check as we have on the forms. As soon as it's working I'll post a patch.