diff --git a/assay/package-lock.json b/assay/package-lock.json
index 5eaa7fc242a..9647a56a022 100644
--- a/assay/package-lock.json
+++ b/assay/package-lock.json
@@ -8,7 +8,7 @@
       "name": "assay",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/components": "7.38.0"
+        "@labkey/components": "7.38.1-moreAccessibility.8"
       },
       "devDependencies": {
         "@labkey/build": "9.1.3",
@@ -3784,9 +3784,9 @@
       }
     },
     "node_modules/@labkey/components": {
-      "version": "7.38.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.38.0.tgz",
-      "integrity": "sha512-9Sthhb5vCyMCgODZCQIvq70Y11UasJTG5vVXdq/FY6q5fKXfT2ipnnltHVO06e6c/yZJAahLmApJD3oVjWj2/A==",
+      "version": "7.38.1-moreAccessibility.8",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.38.1-moreAccessibility.8.tgz",
+      "integrity": "sha512-dzLx7apRP+OBw9ibqLI4aIPEvYibQFeSEVQaQhApjpejFr7C9O4dD93aHDOSnnJaTGJru7nNgRva6jpdGPeTtg==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/assay/package.json b/assay/package.json
index d30d554a370..950ad7751b4 100644
--- a/assay/package.json
+++ b/assay/package.json
@@ -55,7 +55,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "7.38.0"
+    "@labkey/components": "7.38.1-moreAccessibility.8"
   },
   "devDependencies": {
     "@labkey/build": "9.1.3",
diff --git a/core/package-lock.json b/core/package-lock.json
index 4456e003974..86fc8c0fb13 100644
--- a/core/package-lock.json
+++ b/core/package-lock.json
@@ -8,7 +8,7 @@
       "name": "labkey-core",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/components": "7.38.0",
+        "@labkey/components": "7.38.1-moreAccessibility.8",
         "@labkey/themes": "1.9.3"
       },
       "devDependencies": {
@@ -3787,9 +3787,9 @@
       }
     },
     "node_modules/@labkey/components": {
-      "version": "7.38.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.38.0.tgz",
-      "integrity": "sha512-9Sthhb5vCyMCgODZCQIvq70Y11UasJTG5vVXdq/FY6q5fKXfT2ipnnltHVO06e6c/yZJAahLmApJD3oVjWj2/A==",
+      "version": "7.38.1-moreAccessibility.8",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.38.1-moreAccessibility.8.tgz",
+      "integrity": "sha512-dzLx7apRP+OBw9ibqLI4aIPEvYibQFeSEVQaQhApjpejFr7C9O4dD93aHDOSnnJaTGJru7nNgRva6jpdGPeTtg==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/core/package.json b/core/package.json
index db5dbb067d9..d725aaa2b19 100644
--- a/core/package.json
+++ b/core/package.json
@@ -57,7 +57,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "7.38.0",
+    "@labkey/components": "7.38.1-moreAccessibility.8",
     "@labkey/themes": "1.9.3"
   },
   "devDependencies": {
diff --git a/core/resources/views/login.html b/core/resources/views/login.html
index a1ff9db85ad..fa20a14729e 100644
--- a/core/resources/views/login.html
+++ b/core/resources/views/login.html
@@ -3,18 +3,19 @@
     <div class="labkey-error" id="errors"></div>
     <div class="auth-form-body">
         <label for="email">Email</label>
-        <input id="email" name="email" type="text" class="input-block" tabindex="1" autocomplete="off">
+        <input id="email" name="email" type="text" class="input-block" autocomplete="off">
         <label for="password">Password</label>
         <div class="forgot-password-link">
             <a href="login-resetPassword.view">Forgot password</a>
         </div>
-        <input id="password" name="password" type="password" class="input-block" tabindex="2" autocomplete="off">
-        <input tabindex="3" type="checkbox" name="remember" id="remember" checked> Remember my email address
+        <input id="password" name="password" type="password" class="input-block" autocomplete="off">
+        <input aria-labelledby="remember-label" type="checkbox" name="remember" id="remember" checked >
+        <span id="remember-label">Remember my email address</span>
         <div class="termsOfUseSection" hidden>
             <div class="auth-header auth-item">Terms of Use</div>
             <div class="toucontent auth-item termsOfUseContent"></div>
             <div class="auth-item">
-                <input type="checkbox" tabindex="4" name="approvedTermsOfUse" id="approvedTermsOfUse" class="auth-item">
+                <input type="checkbox" name="approvedTermsOfUse" id="approvedTermsOfUse" class="auth-item">
                 <label for="approvedTermsOfUse">I agree to these terms</label>
             </div>
         </div>
@@ -22,7 +23,7 @@
         <div class="auth-item auth-credentials-submit">
             <!-- Note: login.js attaches an authenticateUser() click event to elements with classes "loginSubmitButton" and "signin-btn" -->
             <input type="submit" tabindex="-1" class="loginSubmitButton"/>
-            <a tabindex="5" class="labkey-button primary signin-btn"><span>Sign In</span></a>
+            <button class="labkey-button primary signin-btn" type="button"><span>Sign In</span></button>
             <span class="registrationSection" hidden>
                 <a class="labkey-button" id="registerButton" href="login-register.view">Register</a>
             </span>
@@ -47,4 +48,4 @@
             document.getElementById('registerButton').href += '?returnUrl=' + encodeURIComponent(LABKEY.ActionURL.getParameter('returnUrl'));
         }
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java b/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java
index 5a16004fd77..97eb094a9e4 100644
--- a/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java
+++ b/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java
@@ -51,7 +51,7 @@ public void testReorderConfigurations()
 
         signOut();
         assertSsoLinkOrder(config_uncool, config_cool);
-        clickAndWait(Locator.linkWithText("Sign In"));
+        clickAndWait(Locator.button("Sign In"));
         assertSsoLinkOrder(config_uncool, config_cool);
         simpleSignIn();
 
@@ -64,7 +64,7 @@ public void testReorderConfigurations()
 
         signOut();
         assertSsoLinkOrder(config_cool, config_uncool);
-        clickAndWait(Locator.linkWithText("Sign In"));
+        clickAndWait(Locator.button("Sign In"));
         assertSsoLinkOrder(config_cool, config_uncool);
         simpleSignIn();
     }
diff --git a/experiment/package-lock.json b/experiment/package-lock.json
index 52a797dff86..e809190ca2d 100644
--- a/experiment/package-lock.json
+++ b/experiment/package-lock.json
@@ -8,7 +8,7 @@
       "name": "experiment",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/components": "7.38.0"
+        "@labkey/components": "7.38.1-moreAccessibility.8"
       },
       "devDependencies": {
         "@labkey/build": "9.1.3",
@@ -3622,9 +3622,9 @@
       }
     },
     "node_modules/@labkey/components": {
-      "version": "7.38.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.38.0.tgz",
-      "integrity": "sha512-9Sthhb5vCyMCgODZCQIvq70Y11UasJTG5vVXdq/FY6q5fKXfT2ipnnltHVO06e6c/yZJAahLmApJD3oVjWj2/A==",
+      "version": "7.38.1-moreAccessibility.8",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.38.1-moreAccessibility.8.tgz",
+      "integrity": "sha512-dzLx7apRP+OBw9ibqLI4aIPEvYibQFeSEVQaQhApjpejFr7C9O4dD93aHDOSnnJaTGJru7nNgRva6jpdGPeTtg==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/experiment/package.json b/experiment/package.json
index 934f5ad9bce..3e247963d13 100644
--- a/experiment/package.json
+++ b/experiment/package.json
@@ -13,7 +13,7 @@
     "test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
   },
   "dependencies": {
-    "@labkey/components": "7.38.0"
+    "@labkey/components": "7.38.1-moreAccessibility.8"
   },
   "devDependencies": {
     "@labkey/build": "9.1.3",
diff --git a/pipeline/package-lock.json b/pipeline/package-lock.json
index 2e30dc1e9dd..393d5f04e16 100644
--- a/pipeline/package-lock.json
+++ b/pipeline/package-lock.json
@@ -8,7 +8,7 @@
       "name": "pipeline",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/components": "7.38.0"
+        "@labkey/components": "7.38.1-moreAccessibility.8"
       },
       "devDependencies": {
         "@labkey/build": "9.1.3",
@@ -2957,9 +2957,9 @@
       }
     },
     "node_modules/@labkey/components": {
-      "version": "7.38.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.38.0.tgz",
-      "integrity": "sha512-9Sthhb5vCyMCgODZCQIvq70Y11UasJTG5vVXdq/FY6q5fKXfT2ipnnltHVO06e6c/yZJAahLmApJD3oVjWj2/A==",
+      "version": "7.38.1-moreAccessibility.8",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.38.1-moreAccessibility.8.tgz",
+      "integrity": "sha512-dzLx7apRP+OBw9ibqLI4aIPEvYibQFeSEVQaQhApjpejFr7C9O4dD93aHDOSnnJaTGJru7nNgRva6jpdGPeTtg==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/pipeline/package.json b/pipeline/package.json
index 919a9d4dd41..5150d86c02b 100644
--- a/pipeline/package.json
+++ b/pipeline/package.json
@@ -14,7 +14,7 @@
     "build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile"
   },
   "dependencies": {
-    "@labkey/components": "7.38.0"
+    "@labkey/components": "7.38.1-moreAccessibility.8"
   },
   "devDependencies": {
     "@labkey/build": "9.1.3",