diff --git a/md/clause-12.md b/md/clause-12.md
index dee41f8f4a28c58519202815e9d3f1e72661d804..3e0e020f45cc2336b1f3f2343a8ba60f6a38245c 100644
--- a/md/clause-12.md
+++ b/md/clause-12.md
@@ -59,6 +59,7 @@ exceptions shall apply:
 - If the [Context Source]{.HTML-Keyboard} to be registered has its _`mode`_
   property defined as **exclusive**, the following additional restrictions
   apply:
+
   - If an **exclusive** or **redirect** [Context Source
     Registration]{.HTML-Keyboard} already matches against the Entity ID (URI)
     and any of the Attributes defined in the registration, an error of type
@@ -68,16 +69,20 @@ exceptions shall apply:
     an error of type [Conflict]{.HTML-Error} shall be raised.
 
 - If the [Context Source]{.HTML-Keyboard} to be registered has its _`mode`_
-  property defined as **redirect**, the following additional restriction
-  applies:
+  property defined as **redirect**, the following additional restrictions apply:
+
   - If an existing Entity already matches the [Context Source
     Registration]{.HTML-Keyboard}, an error of type [Conflict]{.HTML-Error}
     shall be raised.
+  - If the _`endpoint`_ and _`tenant`_ properties match the [Context
+    Broker]{.HTML-Keyboard} itself, an error of type [Conflict]{.HTML-Error}
+    shall be raised.
 
 - If the [Context Source]{.HTML-Keyboard} to be registered has its _`mode`_
   property defined as **auxiliary**, the following additional restriction
   applies:
-  - If the _operations_ property is not defined as one of:
+
+  - If the _`operations`_ property is not defined as one of:
     ["retrieveOps"]{.HTML-Code}, ["retrieveEntity"]{.HTML-Code} or
     ["queryEntity",]{.HTML-Code} or a combination thereof, an error of type
     [BadRequestData]{.HTML-Error} shall be raised.
@@ -160,6 +165,7 @@ Figure: Update context source registration use case
 - If the [Context Source Registration]{.HTML-Keyboard} to be updated has its
   _`mode`_ property defined as **exclusive**, the following additional
   restrictions apply:
+
   - If an **exclusive** or **redirect** [Context Source
     Registration]{.HTML-Keyboard} already matches against the Entity ID (URI)
     and any of the Attributes defined in the registration, an error of type
@@ -170,14 +176,19 @@ Figure: Update context source registration use case
 
 - If the [Context Source Registration]{.HTML-Keyboard} to be updated has its
   _`mode`_ property defined as **redirect**, the following additional
-  restriction applies:
+  restrictions apply:
+
   - If an existing Entity already matches the [Context Source
     Registration]{.HTML-Keyboard}, an error of type [Conflict]{.HTML-Error}
     shall be raised.
+  - If the _`endpoint`_ and _`tenant`_ properties match the [Context
+    Broker]{.HTML-Keyboard} itself, an error of type [Conflict]{.HTML-Error}
+    shall be raised.
 
 - If the [Context Source]{.HTML-Keyboard} to be updated has its _`mode`_
   property defined as **auxiliary**, the following additional restriction
   applies:
+
   - If the [operations]{.HTML-Code} property is not defined as one of:
     ["retrieveOps"]{.HTML-Code}, ["retrieveEntity"]{.HTML-Code} or
     ["queryEntity"]{.HTML-Code}, an error of type [BadRequestData]{.HTML-Error}