Improve our model handling in registration
Replace the hack in f671b133 with something a little cleaner. The issue was that we were updating models which weren't the ones referenced by the request`s user object, which we then saved. Instead, let's update those models.