Since using the persistent-id is causing an issue on the site, change it to use Remote-User which has the same value with our hand-made REMOTE_USER
persistent-id
Remote-User
REMOTE_USER