diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 1cea0d9805c..9204186bc5e 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -1000,30 +1000,30 @@ export class GameData {
       const secretId = this.secretId;
       const trainerId = this.trainerId;
 
-      if (!bypassLogin) {
-        pokerogueApi.savedata.session
-          .update({ slot: slotId, trainerId, secretId, clientSessionId }, encrypted)
-          .then(error => {
-            if (error) {
-              console.error("Failed to update session name:", error);
-              resolve(false);
-            } else {
-              localStorage.setItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`, encrypted);
-              updateUserInfo().then(success => {
-                if (success !== null && !success) {
-                  return resolve(false);
-                }
-              });
-              resolve(true);
-            }
-          });
-      } else {
+      if (bypassLogin) {
         localStorage.setItem(
           `sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`,
           encrypt(updatedDataStr, bypassLogin),
         );
         resolve(true);
+        return;
       }
+      pokerogueApi.savedata.session
+        .update({ slot: slotId, trainerId, secretId, clientSessionId }, encrypted)
+        .then(error => {
+          if (error) {
+            console.error("Failed to update session name:", error);
+            resolve(false);
+          } else {
+            localStorage.setItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`, encrypted);
+            updateUserInfo().then(success => {
+              if (success !== null && !success) {
+                return resolve(false);
+              }
+            });
+            resolve(true);
+          }
+        });
     });
   }
 
diff --git a/src/ui/rename-run-ui-handler.ts b/src/ui/rename-run-ui-handler.ts
index 0033079de63..113f432693a 100644
--- a/src/ui/rename-run-ui-handler.ts
+++ b/src/ui/rename-run-ui-handler.ts
@@ -1,7 +1,7 @@
+import i18next from "i18next";
 import type { InputFieldConfig } from "./form-modal-ui-handler";
 import { FormModalUiHandler } from "./form-modal-ui-handler";
 import type { ModalConfig } from "./modal-ui-handler";
-import i18next from "i18next";
 
 export default class RenameRunFormUiHandler extends FormModalUiHandler {
   getModalTitle(_config?: ModalConfig): string {
@@ -34,21 +34,21 @@ export default class RenameRunFormUiHandler extends FormModalUiHandler {
   }
 
   show(args: any[]): boolean {
-    if (super.show(args)) {
-      if (this.inputs?.length) {
-        this.inputs.forEach(input => {
-          input.text = "";
-        });
-      }
-      const config = args[0] as ModalConfig;
-      this.submitAction = _ => {
-        this.sanitizeInputs();
-        const sanitizedName = btoa(encodeURIComponent(this.inputs[0].text));
-        config.buttonActions[0](sanitizedName);
-        return true;
-      };
-      return true;
+    if (!super.show(args)) {
+      return false;
     }
-    return false;
+    if (this.inputs?.length) {
+      this.inputs.forEach(input => {
+        input.text = "";
+      });
+    }
+    const config = args[0] as ModalConfig;
+    this.submitAction = _ => {
+      this.sanitizeInputs();
+      const sanitizedName = btoa(encodeURIComponent(this.inputs[0].text));
+      config.buttonActions[0](sanitizedName);
+      return true;
+    };
+    return true;
   }
 }
diff --git a/test/system/rename_run.test.ts b/test/system/rename_run.test.ts
index 38906129e15..b6e002086a0 100644
--- a/test/system/rename_run.test.ts
+++ b/test/system/rename_run.test.ts
@@ -1,12 +1,12 @@
+import * as account from "#app/account";
 import * as bypassLoginModule from "#app/global-vars/bypass-login";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import type { SessionSaveData } from "#app/system/game-data";
+import { AbilityId } from "#enums/ability-id";
 import { MoveId } from "#enums/move-id";
-import GameManager from "#test/testUtils/gameManager";
+import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as account from "#app/account";
-import { AbilityId } from "#enums/ability-id";
 
 describe("System - Rename Run", () => {
   let phaserGame: Phaser.Game;