diff --git a/.changelog/11892.txt b/.changelog/11892.txt
new file mode 100644
index 000000000..5709c6569
--- /dev/null
+++ b/.changelog/11892.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Ensure a login buttons appear for some error states, plus text amends
+```
diff --git a/ui/packages/consul-ui/app/components/error-state/README.mdx b/ui/packages/consul-ui/app/components/error-state/README.mdx
index 252b41937..2397d4dde 100644
--- a/ui/packages/consul-ui/app/components/error-state/README.mdx
+++ b/ui/packages/consul-ui/app/components/error-state/README.mdx
@@ -7,8 +7,11 @@ for more details.
 Using this component for all of our errors means we can show a consistent
 error page for generic errors.
 
-This component show slighltly different visuals and copy depending on the
-`status` of the error (the status is generally a HTTP error code)
+This component show slightly different visuals and copy depending on the
+`status` of the error (the status is generally a HTTP error code).
+
+Please note: The examples below use a `hash` for demonstration purposes, you'll
+probably just be using an `error` object in real-life.
 
 ## Arguments
 
@@ -17,12 +20,26 @@ This component show slighltly different visuals and copy depending on the
 | `login` | `Function` | `undefined` | A login action to call when the login button is pressed (if not provided no login button will be shown  |
 | `error` | `Object` | `undefined` | 'Consul UI error shaped' JSON `{status: String, message: String, detail: String}` |
 
+Specifically 403 errors **always** use the same header/body copy, this is hardcoded in and not currently overridable.
+
 ```hbs preview-template
 <ErrorState
   @error={{hash status='403'}}
 />
 ```
 
+Other StatusCodes have a global default text but these *are* overridable by using the message/detail properties of the Consul UI shaped errors.
+
+```hbs preview-template
+<ErrorState
+  @error={{hash
+    status='404'
+    message="`message` is what is shown in the header"
+    detail="`detail` is what shown in the body"
+  }}
+/>
+```
+
 As with `EmptyState` you can optionally chose to show a login button using the
 `@login` argument.
 
diff --git a/ui/packages/consul-ui/app/components/error-state/index.hbs b/ui/packages/consul-ui/app/components/error-state/index.hbs
index d32ad7c0e..d05bb30b6 100644
--- a/ui/packages/consul-ui/app/components/error-state/index.hbs
+++ b/ui/packages/consul-ui/app/components/error-state/index.hbs
@@ -4,43 +4,63 @@
     @login={{@login}}
   >
     <BlockSlot @name="header">
-      <h2>{{or @error.message "Consul returned an error"}}</h2>
+      <h2>
+        {{or @error.message "Consul returned an error"}}
+      </h2>
     </BlockSlot>
 {{#if @error.status }}
     <BlockSlot @name="subheader">
-      <h3 data-test-status={{@error.status}}>Error {{@error.status}}</h3>
+      <h3
+        data-test-status={{@error.status}}
+      >
+        Error {{@error.status}}
+      </h3>
     </BlockSlot>
 {{/if}}
     <BlockSlot @name="body">
-      {{#if error.detail}}
-        <p>
-          {{error.detail}}
-        </p>
-      {{else}}
-        <p>
+      <p>
+        {{#if @error.detail}}
+          {{@error.detail}}
+        {{else}}
           You may have visited a URL that is loading an unknown resource, so you can try going back to the root or try re-submitting your ACL Token/SecretID by going back to ACLs.
-        </p>
-      {{/if}}
+        {{/if}}
+      </p>
     </BlockSlot>
     <BlockSlot @name="actions">
       <li class="back-link">
-        <a data-test-home rel="home" href={{href-to 'index'}}>Go back</a>
+        <Action
+          data-test-home
+          @href={{href-to 'index'}}
+        >
+          Go back
+        </Action>
       </li>
       <li class="docs-link">
-        <a href="{{env 'CONSUL_DOCS_URL'}}" rel="noopener noreferrer" target="_blank">Read the documentation</a>
+        <Action
+          @href="{{env 'CONSUL_DOCS_URL'}}"
+          @external={{true}}
+        >
+          Read the documentation
+        </Action>
       </li>
     </BlockSlot>
   </EmptyState>
 {{else}}
   <EmptyState
-    class="status-403"
+    class={{concat "status-" @error.status}}
     @login={{@login}}
   >
     <BlockSlot @name="header">
-      <h2 data-test-status={{@error.status}}>You are not authorized</h2>
+      <h2
+        data-test-status={{@error.status}}
+      >
+        You are not authorized
+      </h2>
     </BlockSlot>
     <BlockSlot @name="subheader">
-      <h3>Error 403</h3>
+      <h3>
+        Error {{@error.status}}
+      </h3>
     </BlockSlot>
     <BlockSlot @name="body">
       <p>
@@ -49,10 +69,20 @@
     </BlockSlot>
     <BlockSlot @name="actions">
       <li class="docs-link">
-        <a href="{{env 'CONSUL_DOCS_URL'}}/acl/index.html" rel="noopener noreferrer" target="_blank">Read the documentation</a>
+        <Action
+          @href="{{env 'CONSUL_DOCS_URL'}}/acl/index.html"
+          @external={{true}}
+        >
+          Read the documentation
+        </Action>
       </li>
       <li class="learn-link">
-        <a href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/security-networking/production-acls" rel="noopener noreferrer" target="_blank">Follow the guide</a>
+        <Action
+          @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/security-networking/production-acls"
+          @external={{true}}
+        >
+          Follow the guide
+        </Action>
       </li>
     </BlockSlot>
   </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
index 136b337db..7c75724d1 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
@@ -90,7 +90,18 @@ as |route|>
             />
           </collection.Collection>
           <collection.Empty>
-            <EmptyState>
+            <EmptyState
+              @login={{route.model.app.login.open}}
+            >
+              <BlockSlot @name="header">
+                <h2>
+                  {{#if (gt items.length 0)}}
+                    No nodes found
+                  {{else}}
+                    Welcome to Nodes
+                  {{/if}}
+                </h2>
+              </BlockSlot>
               <BlockSlot @name="body">
                 <p>
                   There don't seem to be any registered nodes, or you may not have access to view nodes yet.
diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
index 27342bf3c..3d6e04933 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
@@ -105,7 +105,7 @@ as |sort filters items partition nspace|}}
             >
               <BlockSlot @name="header">
                 <h2>
-                  {{#if (gt services.length 0)}}
+                  {{#if (gt items.length 0)}}
                     No services found
                   {{else}}
                     Welcome to Services
@@ -114,7 +114,7 @@ as |sort filters items partition nspace|}}
               </BlockSlot>
               <BlockSlot @name="body">
                 <p>
-                  {{#if (gt services.length 0)}}
+                  {{#if (gt items.length 0)}}
                     No services where found matching that search, or you may not have access to view the services you are searching for.
                   {{else}}
                     There don't seem to be any registered services, or you may not have access to view services yet.
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
index 87d2f9649..003d915f6 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
@@ -89,7 +89,9 @@ as |route|>
                 </Consul::Intention::List>
               </collection.Collection>
               <collection.Empty>
-                <EmptyState>
+                <EmptyState
+                  @login={{route.model.app.login.open}}
+                >
                   <BlockSlot @name="header">
                     <h2>
                       {{#if (gt items.length 0)}}