diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx
index 76b73dda2..93b570fde 100644
--- a/src/app/components/AccountDataEditor.tsx
+++ b/src/app/components/AccountDataEditor.tsx
@@ -127,6 +127,7 @@ function AccountDataEdit({
             <Input
               variant={type.length > 0 || submitting ? 'SurfaceVariant' : 'Background'}
               name="typeInput"
+              aria-label="Account data type"
               size="400"
               radii="300"
               readOnly={type.length > 0 || submitting}
@@ -170,6 +171,7 @@ function AccountDataEdit({
         <TextAreaComponent
           ref={textAreaRef}
           name="contentTextArea"
+          aria-label="JSON content"
           style={{
             fontFamily: 'monospace',
           }}
diff --git a/src/app/components/SecretStorage.tsx b/src/app/components/SecretStorage.tsx
index 9d8628e5f..c128f3958 100644
--- a/src/app/components/SecretStorage.tsx
+++ b/src/app/components/SecretStorage.tsx
@@ -80,6 +80,7 @@ export function SecretStorageRecoveryPassphrase({
           <Text size="L400">Recovery Passphrase</Text>
           <PasswordInput
             name="recoveryPassphraseInput"
+            aria-label="Recovery passphrase"
             size="400"
             variant="Secondary"
             radii="300"
@@ -170,6 +171,7 @@ export function SecretStorageRecoveryKey({
           <Text size="L400">Recovery Key</Text>
           <PasswordInput
             name="recoveryKeyInput"
+            aria-label="Recovery key"
             size="400"
             variant="Secondary"
             radii="300"
diff --git a/src/app/components/uia-stages/EmailStage.tsx b/src/app/components/uia-stages/EmailStage.tsx
index fdc2b61aa..0d286c072 100644
--- a/src/app/components/uia-stages/EmailStage.tsx
+++ b/src/app/components/uia-stages/EmailStage.tsx
@@ -39,10 +39,11 @@ function EmailErrorDialog({
         <Box direction="Column" gap="100">
           <Text size="H4">{title}</Text>
           <Text>{message}</Text>
-          <Text as="label" size="L400" style={{ paddingTop: config.space.S400 }}>
+          <Text as="label" htmlFor="retryEmailInput" size="L400" style={{ paddingTop: config.space.S400 }}>
             Email
           </Text>
           <Input
+            id="retryEmailInput"
             name="retryEmailInput"
             variant="Background"
             size="500"
diff --git a/src/app/pages/client/explore/Explore.tsx b/src/app/pages/client/explore/Explore.tsx
index ed402fb4e..c0f6d05c9 100644
--- a/src/app/pages/client/explore/Explore.tsx
+++ b/src/app/pages/client/explore/Explore.tsx
@@ -110,7 +110,7 @@ export function AddServer() {
                 <Text priority="400">Add server name to explore public communities.</Text>
                 <Box direction="Column" gap="100">
                   <Text size="L400">Server Name</Text>
-                  <Input ref={serverInputRef} name="serverInput" variant="Background" required />
+                  <Input ref={serverInputRef} name="serverInput" aria-label="Server name" variant="Background" required />
                   {exploreState.status === AsyncStatus.Error && (
                     <Text style={{ color: color.Critical.Main }} size="T300">
                       Failed to load public rooms. Please try again.
diff --git a/src/app/pages/client/explore/Server.tsx b/src/app/pages/client/explore/Server.tsx
index 9eefd20b3..ab09d6058 100644
--- a/src/app/pages/client/explore/Server.tsx
+++ b/src/app/pages/client/explore/Server.tsx
@@ -111,6 +111,7 @@ function Search({ active, loading, searchInputRef, onSearch, onReset }: SearchPr
         ref={searchInputRef}
         style={{ paddingRight: config.space.S300 }}
         name="searchInput"
+        aria-label="Search rooms"
         size="500"
         variant="Background"
         placeholder="Search for keyword"