diff --git a/apps/browser/src/popup/accounts/environment.component.html b/apps/browser/src/popup/accounts/environment.component.html
index 3b998d1703..ff19739548 100644
--- a/apps/browser/src/popup/accounts/environment.component.html
+++ b/apps/browser/src/popup/accounts/environment.component.html
@@ -36,13 +36,14 @@
id="baseUrl"
type="text"
name="BaseUrl"
+ aria-describedby="baseUrlHelp"
[(ngModel)]="baseUrl"
placeholder="ex. https://bitwarden.company.com"
appInputVerbatim
/>
-
@@ -50,7 +51,13 @@
-
+
-
diff --git a/apps/browser/src/popup/accounts/hint.component.html b/apps/browser/src/popup/accounts/hint.component.html
index 4f5f975ccf..c3d5ef3d8b 100644
--- a/apps/browser/src/popup/accounts/hint.component.html
+++ b/apps/browser/src/popup/accounts/hint.component.html
@@ -24,6 +24,7 @@
id="email"
type="text"
name="Email"
+ aria-describedby="emailHelp"
[(ngModel)]="email"
required
appAutofocus
@@ -32,7 +33,7 @@
/>
-
diff --git a/apps/browser/src/popup/accounts/lock.component.html b/apps/browser/src/popup/accounts/lock.component.html
index 3c96458766..c5f4bfdf40 100644
--- a/apps/browser/src/popup/accounts/lock.component.html
+++ b/apps/browser/src/popup/accounts/lock.component.html
@@ -30,6 +30,7 @@
id="masterPassword"
type="{{ showPassword ? 'text' : 'password' }}"
name="MasterPassword"
+ aria-describedby="masterPasswordHelp"
class="monospaced"
[(ngModel)]="masterPassword"
required
@@ -54,7 +55,7 @@
-
-
@@ -100,10 +101,10 @@
-
diff --git a/apps/browser/src/popup/accounts/update-temp-password.component.html b/apps/browser/src/popup/accounts/update-temp-password.component.html
index 6fcbb76c3c..3dea8039cf 100644
--- a/apps/browser/src/popup/accounts/update-temp-password.component.html
+++ b/apps/browser/src/popup/accounts/update-temp-password.component.html
@@ -109,10 +109,10 @@
-
diff --git a/apps/browser/src/popup/components/password-reprompt.component.html b/apps/browser/src/popup/components/password-reprompt.component.html
index ed69809735..730e96fab9 100644
--- a/apps/browser/src/popup/components/password-reprompt.component.html
+++ b/apps/browser/src/popup/components/password-reprompt.component.html
@@ -12,6 +12,7 @@
id="masterPassword"
type="{{ showPassword ? 'text' : 'password' }}"
name="MasterPassword"
+ aria-describedby="masterPasswordHelp"
class="monospaced"
[(ngModel)]="masterPassword"
required
@@ -36,7 +37,7 @@
-
diff --git a/apps/browser/src/popup/components/user-verification.component.html b/apps/browser/src/popup/components/user-verification.component.html
index 2fd78bb907..8d7f1ed870 100644
--- a/apps/browser/src/popup/components/user-verification.component.html
+++ b/apps/browser/src/popup/components/user-verification.component.html
@@ -5,6 +5,7 @@
id="masterPassword"
type="password"
name="MasterPasswordHash"
+ aria-describedby="confirmIdentityHelp"
class="form-control"
[formControl]="secret"
required
diff --git a/apps/browser/src/popup/generator/generator.component.html b/apps/browser/src/popup/generator/generator.component.html
index 8178e35536..c6dc49772c 100644
--- a/apps/browser/src/popup/generator/generator.component.html
+++ b/apps/browser/src/popup/generator/generator.component.html
@@ -312,7 +312,9 @@
/>