Attempt to target auth request grant links better

See #2901