diff --git a/src/test/account.spec.ts b/src/test/account.spec.ts
new file mode 100644
index 00000000000..28e48ce9933
--- /dev/null
+++ b/src/test/account.spec.ts
@@ -0,0 +1,74 @@
+import * as battleScene from "#app/battle-scene.js";
+import { describe, expect, it, vi } from "vitest";
+import { initLoggedInUser, loggedInUser, updateUserInfo } from "../account";
+import * as utils from "../utils";
+
+describe("account", () => {
+  describe("initLoggedInUser", () => {
+    it("should set loggedInUser to Guest and lastSessionSlot to -1", () => {
+      initLoggedInUser();
+
+      expect(loggedInUser.username).toBe("Guest");
+      expect(loggedInUser.lastSessionSlot).toBe(-1);
+    });
+  });
+
+  describe("updateUserInfo", () => {
+    it("should set loggedInUser to Guest if bypassLogin is true", async () => {
+      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(true);
+
+      const [success, status] = await updateUserInfo();
+
+      expect(success).toBe(true);
+      expect(status).toBe(200);
+      expect(loggedInUser.username).toBe("Guest");
+      expect(loggedInUser.lastSessionSlot).toBe(-1);
+    });
+
+    it("should fetch user info from the API if bypassLogin is false", async () => {
+      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(false);
+      vi.spyOn(utils, "apiFetch").mockResolvedValue(
+        new Response(
+          JSON.stringify({
+            username: "test",
+            lastSessionSlot: 99,
+          }),
+          {
+            status: 200,
+          }
+        )
+      );
+
+      const [success, status] = await updateUserInfo();
+
+      expect(success).toBe(true);
+      expect(status).toBe(200);
+      expect(loggedInUser.username).toBe("test");
+      expect(loggedInUser.lastSessionSlot).toBe(99);
+    });
+
+    it("should handle resolved API errors", async () => {
+      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(false);
+      vi.spyOn(utils, "apiFetch").mockResolvedValue(
+        new Response(null, { status: 401 })
+      );
+
+      const [success, status] = await updateUserInfo();
+
+      expect(success).toBe(false);
+      expect(status).toBe(401);
+    });
+
+    it("should handle rejected API errors", async () => {
+      const consoleErrorSpy = vi.spyOn(console, "error");
+      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(false);
+      vi.spyOn(utils, "apiFetch").mockRejectedValue(new Error("Api failed!"));
+
+      const [success, status] = await updateUserInfo();
+
+      expect(success).toBe(false);
+      expect(status).toBe(500);
+      expect(consoleErrorSpy).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index db014432b13..687f65281b4 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -2077,9 +2077,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             this.pokemonHatchedIcon,
             this.pokemonHatchedCountText
           ].map(c => c.setVisible(false));
-        } else if (species.speciesId === Species.ETERNATUS) {
-          this.pokemonHatchedIcon.setVisible(false);
-          this.pokemonHatchedCountText.setVisible(false);
+          this.pokemonFormText.setY(25);
         } else {
           this.pokemonCaughtHatchedContainer.setY(25);
           this.pokemonShinyIcon.setY(117);
@@ -2091,6 +2089,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           this.pokemonCandyCountText.setText(`x${this.scene.gameData.starterData[species.speciesId].candyCount}`);
           this.pokemonCandyCountText.setVisible(true);
           this.pokemonFormText.setVisible(true);
+          this.pokemonFormText.setY(42);
           this.pokemonHatchedIcon.setVisible(true);
           this.pokemonHatchedCountText.setVisible(true);