Ah/minor fixes

All Submissions:

---

• [YES] Have you added an explanation of what your changes do and why you'd like us to include them?
• [YES] I have updated the documentation accordingly.
• [YES] My code follows the code style of this project.

Current Behavior or Linked Issues

---

This MR covers comments:

• !821 (comment 224035)
• !791 (comment 224074)

Does this introduce a breaking change?

---

• [NO]

It should not affect but only secret service if the keyvault needs to be replaced.

Other information

---

Related to:

• !821 (merged)
• !791 (merged)