Merge branch 'feature/short-sso-trackid'

* feature/short-sso-trackid:
  Add the tracking identifier to the error message, so that we can track the logs and see what happened when someone gets this error.