Sync with 1.4, user is now remote_user.