Fixing up some search/replace errors regarding user/remote_user