Address Oleg's comment on handling of RPC user.