We should aim to use `person` instead of `user` for user-facing text (oh, the irony). I think this will be taken care of anyway by the comments above.