Scratch's video problem

Attempt to fix Scratch's video problem and a very interesting user
privilege edge case - if you fail on an update, you got bounced from
your own form because we didn't fetch user id a second time.