diff --git a/framework/core/js/src/admin/components/UserListPage.tsx b/framework/core/js/src/admin/components/UserListPage.tsx
index e2b64583c..7d934ccf1 100644
--- a/framework/core/js/src/admin/components/UserListPage.tsx
+++ b/framework/core/js/src/admin/components/UserListPage.tsx
@@ -318,7 +318,7 @@ export default class UserListPage extends AdminPage {
               )
             );
 
-            emailAddress.attr('aria-hidden', visible ? 'false' : 'true');
+            emailAddress.attr('aria-hidden', visible ? null : 'true');
 
             if (visible) {
               emailToggleButtonIcon.addClass('fa-eye');
diff --git a/framework/core/js/src/common/components/ModalManager.tsx b/framework/core/js/src/common/components/ModalManager.tsx
index 498fa401d..f2a46501f 100644
--- a/framework/core/js/src/common/components/ModalManager.tsx
+++ b/framework/core/js/src/common/components/ModalManager.tsx
@@ -98,7 +98,7 @@ export default class ModalManager extends Component<IModalManagerAttrs> {
         // See: http://web-accessibility.carnegiemuseums.org/code/dialogs/
 
         if (!this.attrs.state.isModalOpen()) {
-          document.getElementById('app')?.setAttribute('aria-hidden', 'false');
+          document.getElementById('app')?.removeAttribute('aria-hidden');
           this.focusTrap!.deactivate?.();
           clearAllBodyScrollLocks();