Matt, your solution works, but you may end up with some extra user accounts from folks that have bailed. Someone may get the wrong message, too, if Ubercart displays something based on new vs. returning users. Not a big deal, though.