Oh I should add that I didn't actually know this second block was in place until I tried editing my own user page and it was auto-reset, so yeah, it's kind of hard to argue it's not a bug.
Then go and do the correct thing, and make a request on bugzilla. Stop giving us earache.
Sam