Add support for new "server-user" option.