diff --git a/elixir/apps/web/lib/web/components/core_components.ex b/elixir/apps/web/lib/web/components/core_components.ex
index dbf49c352..f8df6abb4 100644
--- a/elixir/apps/web/lib/web/components/core_components.ex
+++ b/elixir/apps/web/lib/web/components/core_components.ex
@@ -19,7 +19,7 @@ defmodule Web.CoreComponents do
   def hero_logo(assigns) do
     ~H"""
     <div class="mb-6">
-      <img src={~p"/images/logo.svg"} class="mx-auto pr-10 h-32" alt="Firezone Logo" />
+      <img src={~p"/images/logo.svg"} class="mx-auto pr-10 h-24" alt="Firezone Logo" />
       <p class="text-center mt-4 text-3xl">
         <%= @text %>
       </p>
diff --git a/elixir/apps/web/lib/web/controllers/sign_in_html.ex b/elixir/apps/web/lib/web/controllers/sign_in_html.ex
index 711b8cf75..1590304fc 100644
--- a/elixir/apps/web/lib/web/controllers/sign_in_html.ex
+++ b/elixir/apps/web/lib/web/controllers/sign_in_html.ex
@@ -30,7 +30,7 @@ defmodule Web.SignInHTML do
         <main class="h-auto pt-16">
           <section>
             <div class="flex flex-col items-center justify-center px-6 py-8 mx-auto lg:py-0">
-              <.logo />
+              <.hero_logo text={@account.name} />
 
               <div class="w-full col-span-6 mx-auto bg-white rounded shadow md:mt-0 sm:max-w-lg xl:p-0">
                 <div class="p-6 space-y-4 lg:space-y-6 sm:p-8">
@@ -55,7 +55,7 @@ defmodule Web.SignInHTML do
     <main class="h-auto pt-16">
       <section>
         <div class="flex flex-col items-center justify-center px-6 py-8 mx-auto lg:py-0">
-          <.logo />
+          <.hero_logo text={@account.name} />
 
           <div class="w-full col-span-6 mx-auto bg-white rounded shadow md:mt-0 sm:max-w-lg xl:p-0">
             <div class="p-6 space-y-4 lg:space-y-6 sm:p-8">
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
index fb873685a..98b058279 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
@@ -177,7 +177,7 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.Show do
                       not is_nil(@provider.sync_disabled_at) or
                       (@provider.last_syncs_failed > 3 and not is_nil(@provider.last_sync_error))
                   }
-                  class="p-3 mt-2 border-l-4 border-red-500 bg-red-100 rounded-md"
+                  class="w-fit p-3 mt-2 border-l-4 border-red-500 bg-red-100 rounded-md"
                 >
                   <p class="font-medium text-red-700">
                     IdP provider reported an error during the last sync:
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/jumpcloud/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/jumpcloud/show.ex
index 18272b6ac..2dd750899 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/jumpcloud/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/jumpcloud/show.ex
@@ -187,7 +187,7 @@ defmodule Web.Settings.IdentityProviders.JumpCloud.Show do
                         not is_nil(@provider.sync_disabled_at) or
                         (@provider.last_syncs_failed > 3 and not is_nil(@provider.last_sync_error))
                     }
-                    class="p-3 mt-2 border-l-4 border-red-500 bg-red-100 rounded-md"
+                    class="w-fit p-3 mt-2 border-l-4 border-red-500 bg-red-100 rounded-md"
                   >
                     <p class="font-medium text-red-700">
                       IdP provider reported an error during the last sync:
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/microsoft_entra/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/microsoft_entra/show.ex
index 4fbc69452..e1c88ee31 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/microsoft_entra/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/microsoft_entra/show.ex
@@ -177,7 +177,7 @@ defmodule Web.Settings.IdentityProviders.MicrosoftEntra.Show do
                       not is_nil(@provider.sync_disabled_at) or
                       (@provider.last_syncs_failed > 3 and not is_nil(@provider.last_sync_error))
                   }
-                  class="p-3 mt-2 border-l-4 border-red-500 bg-red-100 rounded-md"
+                  class="w-fit p-3 mt-2 border-l-4 border-red-500 bg-red-100 rounded-md"
                 >
                   <p class="font-medium text-red-700">
                     IdP provider reported an error during the last sync:
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/okta/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/okta/show.ex
index 1b79d5156..d518e4a04 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/okta/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/okta/show.ex
@@ -175,7 +175,7 @@ defmodule Web.Settings.IdentityProviders.Okta.Show do
                       not is_nil(@provider.sync_disabled_at) or
                       (@provider.last_syncs_failed > 3 and not is_nil(@provider.last_sync_error))
                   }
-                  class="p-3 mt-2 border-l-4 border-red-500 bg-red-100 rounded-md"
+                  class="w-fit p-3 mt-2 border-l-4 border-red-500 bg-red-100 rounded-md"
                 >
                   <p class="font-medium text-red-700">
                     IdP provider reported an error during the last sync:
diff --git a/elixir/apps/web/lib/web/live/sign_in/email.ex b/elixir/apps/web/lib/web/live/sign_in/email.ex
index c7282121e..e5a0c0b3b 100644
--- a/elixir/apps/web/lib/web/live/sign_in/email.ex
+++ b/elixir/apps/web/lib/web/live/sign_in/email.ex
@@ -53,7 +53,7 @@ defmodule Web.SignIn.Email do
     ~H"""
     <section>
       <div class="flex flex-col items-center justify-center px-6 py-8 mx-auto lg:py-0">
-        <.logo />
+        <.hero_logo text={@account.name} />
 
         <div class="w-full col-span-6 mx-auto bg-white rounded shadow md:mt-0 sm:max-w-lg xl:p-0">
           <div class="p-6 space-y-4 lg:space-y-6 sm:p-8">
diff --git a/elixir/apps/web/test/web/controllers/sign_in_controller_test.exs b/elixir/apps/web/test/web/controllers/sign_in_controller_test.exs
index 614387db6..01c485e54 100644
--- a/elixir/apps/web/test/web/controllers/sign_in_controller_test.exs
+++ b/elixir/apps/web/test/web/controllers/sign_in_controller_test.exs
@@ -40,12 +40,20 @@ defmodule Web.SignInControllerTest do
       assert query_params["account_slug"] == account.slug
     end
 
-    test "redirects to sign in page when cookie not present", %{account: account} do
+    test "instructs user to restart sign in when cookie not present", %{account: account} do
       conn =
         build_conn()
         |> get(~p"/#{account}/sign_in/client_redirect")
 
       assert redirected_to(conn, 302) =~ ~p"/#{account}/sign_in/client_auth_error"
     end
+
+    test "displays account name on client auth error page", %{account: account} do
+      conn =
+        build_conn()
+        |> get(~p"/#{account}/sign_in/client_auth_error")
+
+      assert html_response(conn, 200) =~ account.name
+    end
   end
 end