Issue #1356 - Improve detection of the issuer of the request
Issue #1356 - 2. Fix the renaming.