diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts
index 1b9ab3c809..1e6064cfc1 100644
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -198,12 +198,12 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
         navigator.serviceWorker.getRegistration().then((registration) => {
           if (registration) {
             registration.update();
-          } else {
+          } else if (oldVersion) {
             // @ts-ignore Firefox supports forceGet
             location.reload(true);
           }
         });
-      } else {
+      } else if (oldVersion) {
         // @ts-ignore Firefox supports forceGet
         location.reload(true);
       }
diff --git a/src/onboarding/ha-onboarding.ts b/src/onboarding/ha-onboarding.ts
index 1aa4ee1a4b..ca926802b8 100644
--- a/src/onboarding/ha-onboarding.ts
+++ b/src/onboarding/ha-onboarding.ts
@@ -436,7 +436,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
       let redirectUrl = authParams.redirect_uri!;
       redirectUrl +=
         (redirectUrl.includes("?") ? "&" : "?") +
-        `code=${encodeURIComponent(result.auth_code)}`;
+        `code=${encodeURIComponent(result.auth_code)}&storeToken=true`;
 
       if (authParams.state) {
         redirectUrl += `&state=${encodeURIComponent(authParams.state)}`;