issue #19224: Make sure we always set user to enhanced auth.