diff --git a/data/api/client-server/whoami.yaml b/data/api/client-server/whoami.yaml
index 8f4027e73..55e5cb794 100644
--- a/data/api/client-server/whoami.yaml
+++ b/data/api/client-server/whoami.yaml
@@ -44,6 +44,8 @@ paths:
                 properties:
                   user_id:
                     type: string
+                    format: mx-user-id
+                    pattern: "^@"
                     description: The user ID that owns the access token.
                   device_id:
                     x-addedInMatrixVersion: "1.1"
diff --git a/data/event-schemas/schema/m.identity_server.yaml b/data/event-schemas/schema/m.identity_server.yaml
index acd0eb92a..1c08b047e 100644
--- a/data/event-schemas/schema/m.identity_server.yaml
+++ b/data/event-schemas/schema/m.identity_server.yaml
@@ -9,7 +9,10 @@ properties:
     type: object
     properties:
       base_url:
-        type: string
+        anyOf:
+          - type: string
+            format: uri
+          - type: "null"
         description: |-
           The URL of the identity server the user prefers to use, or `null`
           if the user does not want to use an identity server. This value is