More correct pattern for publishing user.

Long, but probably better to show the pedantically correct thing so users don't
get hurt if they copy, paste and modify.

Fixes #1885