diff --git a/res/css/views/settings/encryption/_AdvancedPanel.pcss b/res/css/views/settings/encryption/_AdvancedPanel.pcss
index cf61bb1568..fed8fca7ea 100644
--- a/res/css/views/settings/encryption/_AdvancedPanel.pcss
+++ b/res/css/views/settings/encryption/_AdvancedPanel.pcss
@@ -19,6 +19,7 @@
         padding-bottom: var(--cpd-space-2x);
         border-bottom: 1px solid var(--cpd-color-gray-400);
         width: 100%;
+        margin: 0;
     }
 }
 
diff --git a/src/components/views/settings/encryption/AdvancedPanel.tsx b/src/components/views/settings/encryption/AdvancedPanel.tsx
index 856f27821c..214164ec91 100644
--- a/src/components/views/settings/encryption/AdvancedPanel.tsx
+++ b/src/components/views/settings/encryption/AdvancedPanel.tsx
@@ -63,9 +63,9 @@ function EncryptionDetails({ onResetIdentityClick }: EncryptionDetails): JSX.Ele
     return (
         <div className="mx_EncryptionDetails">
             <div className="mx_EncryptionDetails_session">
-                <span className="mx_EncryptionDetails_session_title">
+                <h3 className="mx_EncryptionDetails_session_title">
                     {_t("settings|encryption|advanced|details_title")}
-                </span>
+                </h3>
                 <div>
                     <span>{_t("settings|encryption|advanced|session_id")}</span>
                     <span>{matrixClient.deviceId}</span>
@@ -131,9 +131,7 @@ function OtherSettings(): JSX.Element | null {
                 await SettingsStore.setValue("blacklistUnverifiedDevices", null, SettingLevel.DEVICE, checked);
             }}
         >
-            <span className="mx_OtherSettings_title">
-                {_t("settings|encryption|advanced|other_people_device_title")}
-            </span>
+            <h3 className="mx_OtherSettings_title">{_t("settings|encryption|advanced|other_people_device_title")}</h3>
             <InlineField
                 name="neverSendEncrypted"
                 control={<ToggleControl name="neverSendEncrypted" defaultChecked={blacklistUnverifiedDevices} />}
diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts
index 1809fa91c8..3be82e3ee8 100644
--- a/test/test-utils/test-utils.ts
+++ b/test/test-utils/test-utils.ts
@@ -116,7 +116,7 @@ export function createTestClient(): MatrixClient {
         },
 
         getCrypto: jest.fn().mockReturnValue({
-            getOwnDeviceKeys: jest.fn(),
+            getOwnDeviceKeys: jest.fn().mockResolvedValue({ ed25519: "ed25519", curve25519: "curve25519" }),
             getUserDeviceInfo: jest.fn().mockResolvedValue(new Map()),
             getUserVerificationStatus: jest.fn(),
             getDeviceVerificationStatus: jest.fn(),