diff --git a/ui/app/components/sidebar/nav/cluster.hbs b/ui/app/components/sidebar/nav/cluster.hbs
index 590ef55121..b7ab90efb4 100644
--- a/ui/app/components/sidebar/nav/cluster.hbs
+++ b/ui/app/components/sidebar/nav/cluster.hbs
@@ -126,7 +126,7 @@
       @text="System Messages"
       data-test-sidebar-nav-link="System Messages"
     />
-    {{#if this.isRootNamespace}}
+    {{#if (or this.isRootNamespace this.namespace.isHvdAdminNamespace)}}
       <Nav.Link
         @route="vault.cluster.config-ui.login-settings"
         @text="UI Login Rules"
diff --git a/ui/tests/acceptance/config-ui/login-settings-test.js b/ui/tests/acceptance/config-ui/login-settings-test.js
index f5c9fa8d28..802a5d4e33 100644
--- a/ui/tests/acceptance/config-ui/login-settings-test.js
+++ b/ui/tests/acceptance/config-ui/login-settings-test.js
@@ -5,7 +5,6 @@
 
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { setupMirage } from 'ember-cli-mirage/test-support';
 import { click, visit, currentRouteName } from '@ember/test-helpers';
 import { login } from 'vault/tests/helpers/auth/auth-helpers';
 import { GENERAL } from 'vault/tests/helpers/general-selectors';
@@ -13,7 +12,6 @@ import { runCmd } from 'vault/tests/helpers/commands';
 
 module('Acceptance | Enterprise | config-ui/login-settings', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   hooks.beforeEach(async function () {
     await login();
@@ -26,6 +24,8 @@ module('Acceptance | Enterprise | config-ui/login-settings', function (hooks) {
   });
 
   hooks.afterEach(async function () {
+    await login();
+
     // cleanup login rules
     await runCmd([
       'delete sys/config/ui/login/default-auth/testRule',