diff --git a/src/auth/ha-auth-flow.ts b/src/auth/ha-auth-flow.ts
index 17802aca3b..d8a08c65ea 100644
--- a/src/auth/ha-auth-flow.ts
+++ b/src/auth/ha-auth-flow.ts
@@ -90,7 +90,6 @@ export class HaAuthFlow extends LitElement {
           text-align: center;
         }
         ha-auth-flow .store-token {
-          margin-top: 10px;
           margin-left: -16px;
         }
         a.forgot-password {
diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts
index d8c859b4fe..78360f8e3e 100644
--- a/src/auth/ha-authorize.ts
+++ b/src/auth/ha-authorize.ts
@@ -114,18 +114,17 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
             var(--divider-color, #e0e0e0)
           );
           color: var(--primary-text-color);
-          transition: all 0.3s ease-out;
           position: relative;
           padding: 16px;
         }
         .footer {
+          padding-top: 8px;
           display: flex;
           justify-content: space-between;
           align-items: center;
         }
         ha-language-picker {
           width: 200px;
-          margin-top: 8px;
           border-radius: 4px;
           overflow: hidden;
           --ha-select-height: 40px;
diff --git a/src/auth/ha-local-auth-flow.ts b/src/auth/ha-local-auth-flow.ts
index eeae4c6d41..c1f601ffcf 100644
--- a/src/auth/ha-local-auth-flow.ts
+++ b/src/auth/ha-local-auth-flow.ts
@@ -72,7 +72,7 @@ export class HaLocalAuthFlow extends LitElement {
           max-width: 560px;
         }
         .persons {
-          margin-top: 32px;
+          margin-top: 24px;
           display: flex;
           flex-wrap: wrap;
           gap: 16px;
@@ -173,6 +173,7 @@ export class HaLocalAuthFlow extends LitElement {
           border: none;
           padding: 8px;
           font: inherit;
+          font-size: 0.875rem;
           text-align: left;
           cursor: pointer;
           outline: none;
@@ -264,9 +265,7 @@ export class HaLocalAuthFlow extends LitElement {
           : html`<h1>
                 ${this.localize("ui.panel.page-authorize.welcome_home")}
               </h1>
-              <p>
-                ${this.localize("ui.panel.page-authorize.who_is_logging_in")}
-              </p>
+              ${this.localize("ui.panel.page-authorize.who_is_logging_in")}
               <div
                 class="persons ${userIds.length < 10 && userIds.length % 4 === 1
                   ? "force-small"
@@ -322,6 +321,7 @@ export class HaLocalAuthFlow extends LitElement {
 
   private _restart() {
     this._selectedUser = undefined;
+    this._error = undefined;
   }
 
   private _toggleUnmaskedPassword() {
diff --git a/src/onboarding/ha-onboarding.ts b/src/onboarding/ha-onboarding.ts
index f69b536941..164d6c931e 100644
--- a/src/onboarding/ha-onboarding.ts
+++ b/src/onboarding/ha-onboarding.ts
@@ -495,6 +495,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
       z-index: 10;
     }
     .footer {
+      padding-top: 8px;
       display: flex;
       justify-content: space-between;
       align-items: center;
@@ -502,7 +503,6 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
     ha-language-picker {
       display: block;
       width: 200px;
-      margin-top: 8px;
       border-radius: 4px;
       overflow: hidden;
       --ha-select-height: 40px;