diff --git a/app/constants.ts b/app/constants.ts
index 5cb92b991..27f2622f2 100644
--- a/app/constants.ts
+++ b/app/constants.ts
@@ -65,7 +65,7 @@ export const PLUS_UPVOTE = 1;
 export const PLUS_DOWNVOTE = -1;
 
 export const ADMIN_DISCORD_ID = "79237403620945920";
-export const ADMIN_ID = process.env.NODE_ENV === "production" ? 274 : 1;
+export const ADMIN_ID = 274;
 
 //                      Panda
 export const MOD_IDS = [11329];
diff --git a/app/db/seed/index.ts b/app/db/seed/index.ts
index 57fe8349a..ac2944390 100644
--- a/app/db/seed/index.ts
+++ b/app/db/seed/index.ts
@@ -77,9 +77,10 @@ const basicSeeds = (variation?: SeedVariation | null) => [
   adminUser,
   makeAdminPatron,
   makeAdminVideoAdder,
-  adminUserWeaponPool,
   nzapUser,
   users,
+  fixAdminId,
+  adminUserWeaponPool,
   userProfiles,
   userMapModePreferences,
   userQWeaponPool,
@@ -121,9 +122,13 @@ const basicSeeds = (variation?: SeedVariation | null) => [
 export async function seed(variation?: SeedVariation | null) {
   wipeDB();
 
+  let count = 0;
   for (const seedFunc of basicSeeds(variation)) {
     if (!seedFunc) continue;
 
+    count++;
+    console.log(`Running seed ${count}/${basicSeeds().length}`);
+
     // eslint-disable-next-line @typescript-eslint/await-thenable
     await seedFunc();
   }
@@ -171,8 +176,8 @@ function wipeDB() {
   }
 }
 
-function adminUser() {
-  return UserRepository.upsert({
+async function adminUser() {
+  await UserRepository.upsert({
     discordDiscriminator: "0",
     discordId: ADMIN_DISCORD_ID,
     discordName: "Sendou",
@@ -184,6 +189,12 @@ function adminUser() {
   });
 }
 
+function fixAdminId() {
+  sql.prepare(`delete from user where id = ${ADMIN_ID}`).run();
+  // make admin same ID as prod for easy switching
+  sql.prepare(`update "User" set "id" = ${ADMIN_ID} where id = 1`).run();
+}
+
 function makeAdminPatron() {
   sql
     .prepare(
@@ -205,7 +216,7 @@ function adminUserWeaponPool() {
         values ($userId, $weaponSplId, $order)
     `,
       )
-      .run({ userId: 1, weaponSplId, order: i + 1 });
+      .run({ userId: ADMIN_ID, weaponSplId, order: i + 1 });
   }
 }
 
@@ -234,7 +245,7 @@ async function users() {
 async function userProfiles() {
   for (const args of [
     {
-      userId: 1,
+      userId: ADMIN_ID,
       country: "FI",
       customUrl: "sendou",
       motionSens: 50,
@@ -264,7 +275,8 @@ async function userProfiles() {
       .run(args);
   }
 
-  for (let id = 3; id < 500; id++) {
+  for (let id = 2; id < 500; id++) {
+    if (id === ADMIN_ID || id === NZAP_TEST_ID) continue;
     if (Math.random() < 0.25) continue; // 75% have bio
 
     sql
@@ -281,7 +293,8 @@ async function userProfiles() {
       });
   }
 
-  for (let id = 3; id < 500; id++) {
+  for (let id = 2; id < 500; id++) {
+    if (id === ADMIN_ID || id === NZAP_TEST_ID) continue;
     if (Math.random() < 0.15) continue; // 85% have weapons
 
     const weapons = shuffle([...mainWeaponIds]);
@@ -411,7 +424,7 @@ function uniqueDiscordName(usedNames: Set<string>) {
 }
 
 const idToPlusTier = (id: number) => {
-  if (id < 30) return 1;
+  if (id < 30 || id === ADMIN_ID) return 1;
   if (id < 80) return 2;
   if (id <= 150) return 3;
 
@@ -430,11 +443,13 @@ async function lastMonthsVoting() {
 
   const fiveMinutesAgo = new Date(new Date().getTime() - 5 * 60 * 1000);
 
-  for (let id = 1; id < 151; id++) {
-    if (id === 2) continue; // omit N-ZAP user for testing;
+  for (let i = 1; i < 151; i++) {
+    if (i === NZAP_TEST_ID) continue; // omit N-ZAP user for testing;
+
+    const id = i === 1 ? ADMIN_ID : i;
 
     votes.push({
-      authorId: 1,
+      authorId: ADMIN_ID,
       month,
       year,
       score: 1,
@@ -446,7 +461,7 @@ async function lastMonthsVoting() {
 
   for (let id = 200; id < 225; id++) {
     votes.push({
-      authorId: 1,
+      authorId: ADMIN_ID,
       month,
       year,
       score: -1,
@@ -467,7 +482,7 @@ async function lastMonthSuggestions() {
 
   for (const id of usersSuggested) {
     await PlusSuggestionRepository.create({
-      authorId: 1,
+      authorId: ADMIN_ID,
       month,
       year,
       suggestedId: id,
@@ -529,7 +544,7 @@ function badgesToAdmin() {
       .prepare(
         `insert into "TournamentBadgeOwner" ("badgeId", "userId") values ($id, $userId)`,
       )
-      .run({ id, userId: 1 });
+      .run({ id, userId: ADMIN_ID });
   }
 }
 
@@ -578,7 +593,7 @@ function badgeManagers() {
       .prepare(
         `insert into "BadgeManager" ("badgeId", "userId") values ($id, $userId)`,
       )
-      .run({ id, userId: 2 });
+      .run({ id, userId: NZAP_TEST_ID });
   }
 }
 
@@ -611,13 +626,19 @@ function userIdsInRandomOrder(specialLast = false) {
 
   if (!specialLast) return rows;
 
-  return [...rows.filter((id) => id !== 1 && id !== 2), 1, 2];
+  return [
+    ...rows.filter((id) => id !== ADMIN_ID && id !== NZAP_TEST_ID),
+    ADMIN_ID,
+    NZAP_TEST_ID,
+  ];
 }
 
 function userIdsInAscendingOrderById() {
-  return (
+  const ids = (
     sql.prepare(`select "id" from "User" order by id asc`).all() as any[]
   ).map((u) => u.id) as number[];
+
+  return [ADMIN_ID, ...ids.filter((id) => id !== ADMIN_ID)];
 }
 
 function calendarEvents() {
@@ -839,7 +860,7 @@ function calendarEventWithToTools(sz?: boolean) {
       description: faker.lorem.paragraph(),
       discordInviteCode: faker.lorem.word(),
       bracketUrl: faker.internet.url(),
-      authorId: 1,
+      authorId: ADMIN_ID,
       tournamentId,
     });
 
@@ -1132,7 +1153,7 @@ async function adminBuilds() {
       title: `${capitalize(faker.word.adjective())} ${capitalize(
         faker.word.noun(),
       )}`,
-      ownerId: 1,
+      ownerId: ADMIN_ID,
       private: 0,
       description: Math.random() < 0.75 ? faker.lorem.paragraph() : null,
       headGearSplId: randomOrderHeadGear[0]!,
@@ -1180,7 +1201,7 @@ async function manySplattershotBuilds() {
     500,
   ];
 
-  for (let i = 0; i < 500; i++) {
+  for (let i = 0; i < 499; i++) {
     const SPLATTERSHOT_ID = 40;
 
     const randomOrderHeadGear = shuffle(headGearIds.slice());
@@ -1190,12 +1211,14 @@ async function manySplattershotBuilds() {
       (id) => id !== SPLATTERSHOT_ID,
     );
 
+    const ownerId = users.pop()!;
+
     await BuildRepository.create({
       private: 0,
       title: `${capitalize(faker.word.adjective())} ${capitalize(
         faker.word.noun(),
       )}`,
-      ownerId: users.pop()!,
+      ownerId,
       description: Math.random() < 0.75 ? faker.lorem.paragraph() : null,
       headGearSplId: randomOrderHeadGear[0]!,
       clothesGearSplId: randomOrderClothesGear[0]!,
@@ -1241,8 +1264,8 @@ function detailedTeam() {
       /* sql */ `
     insert into "UnvalidatedUserSubmittedImage" ("validatedAt", "url", "submitterUserId")
       values 
-        (1672587342, 'AiGSM5T-cxm6BFGT7N_lA-1673297699133.webp', 1), 
-        (1672587342, 'jTbWd95klxU2MzGFIdi1c-1673297932788.webp', 1)
+        (1672587342, 'AiGSM5T-cxm6BFGT7N_lA-1673297699133.webp', ${ADMIN_ID}), 
+        (1672587342, 'jTbWd95klxU2MzGFIdi1c-1673297932788.webp', ${ADMIN_ID})
   `,
     )
     .run();
@@ -1264,9 +1287,11 @@ function detailedTeam() {
     )
     .run();
 
-  const userIds = userIdsInRandomOrder(true).filter((id) => id !== 2);
+  const userIds = userIdsInRandomOrder(true).filter(
+    (id) => id !== NZAP_TEST_ID,
+  );
   for (let i = 0; i < 5; i++) {
-    const userId = i === 0 ? 1 : userIds.shift()!;
+    const userId = i === 0 ? ADMIN_ID : userIds.shift()!;
 
     sql
       .prepare(
@@ -1298,7 +1323,7 @@ function otherTeams() {
   ).map((row) => row.userId);
 
   const userIds = userIdsInRandomOrder().filter(
-    (u) => !usersInTeam.includes(u) && u !== 2,
+    (u) => !usersInTeam.includes(u) && u !== NZAP_TEST_ID,
   );
 
   for (let i = 3; i < 50; i++) {
@@ -1358,9 +1383,9 @@ function realVideo() {
     type: "TOURNAMENT",
     youtubeId: "M4aV-BQWlVg",
     youtubeDate: dateToDatabaseTimestamp(new Date("02-02-2023")),
-    submitterUserId: 1,
+    submitterUserId: ADMIN_ID,
     title: "LUTI Division X Tournament - ABBF (THRONE) vs. Ascension",
-    povUserId: 2,
+    povUserId: NZAP_TEST_ID,
     isValidated: true,
     matches: [
       {
@@ -1409,7 +1434,7 @@ function realVideoCast() {
     type: "CAST",
     youtubeId: "M4aV-BQWlVg",
     youtubeDate: dateToDatabaseTimestamp(new Date("02-02-2023")),
-    submitterUserId: 1,
+    submitterUserId: ADMIN_ID,
     title: "LUTI Division X Tournament - ABBF (THRONE) vs. Ascension",
     isValidated: true,
     matches: [
@@ -1487,7 +1512,7 @@ function xRankPlacements() {
     for (const [i, placement] of placements.entries()) {
       const userId = () => {
         // admin
-        if (placement.playerSplId === "qx6imlx72tfeqrhqfnmm") return 1;
+        if (placement.playerSplId === "qx6imlx72tfeqrhqfnmm") return ADMIN_ID;
         // user in top 500 who is not plus server member
         if (i === 0) return 500;
 
@@ -1507,12 +1532,16 @@ function userFavBadges() {
   const badgeList = shuffle(
     (
       sql
-        .prepare(`select "badgeId" from "BadgeOwner" where "userId" = 1`)
+        .prepare(
+          `select "badgeId" from "BadgeOwner" where "userId" = ${ADMIN_ID}`,
+        )
         .all() as any[]
     ).map((row) => row.badgeId),
   );
   sql
-    .prepare(`update "User" set "favoriteBadgeId" = $id where "id" = 1`)
+    .prepare(
+      `update "User" set "favoriteBadgeId" = $id where "id" = ${ADMIN_ID}`,
+    )
     .run({ id: badgeList[0] });
 }
 
diff --git a/app/db/sql.ts b/app/db/sql.ts
index 3466c9a8b..5f3b92d79 100644
--- a/app/db/sql.ts
+++ b/app/db/sql.ts
@@ -21,5 +21,12 @@ export const db = new Kysely<DB>({
     database: sql,
   }),
   log: process.env.NODE_ENV === "development" ? ["query"] : undefined,
+  // uncomment if you want examine the parameters of the queries
+  // log(event): void {
+  //   if (event.level === "query") {
+  //     console.log(event.query.sql);
+  //     console.log(event.query.parameters);
+  //   }
+  // },
   plugins: [new ParseJSONResultsPlugin()],
 });
diff --git a/app/features/admin/routes/admin.tsx b/app/features/admin/routes/admin.tsx
index 01e954b9b..b22bc6757 100644
--- a/app/features/admin/routes/admin.tsx
+++ b/app/features/admin/routes/admin.tsx
@@ -372,7 +372,7 @@ function Seed() {
       action={SEED_URL}
     >
       <h2>Seed</h2>
-      <Button type="submit">Seed</Button>
+      <SubmitButton state={fetcher.state}>Seed</SubmitButton>
     </fetcher.Form>
   );
 }
diff --git a/app/features/team/routes/t.$customUrl.roster.tsx b/app/features/team/routes/t.$customUrl.roster.tsx
index bda85413d..a0413d801 100644
--- a/app/features/team/routes/t.$customUrl.roster.tsx
+++ b/app/features/team/routes/t.$customUrl.roster.tsx
@@ -274,7 +274,7 @@ function MemberRow({
           <Button
             size="tiny"
             variant="minimal-destructive"
-            testId={`kick-button-${number}`}
+            testId={!isSelf ? "kick-button" : undefined}
           >
             {t("team:actionButtons.kick")}
           </Button>
diff --git a/app/utils/playwright.ts b/app/utils/playwright.ts
index 23453ad66..cef779ca8 100644
--- a/app/utils/playwright.ts
+++ b/app/utils/playwright.ts
@@ -1,4 +1,5 @@
 import { expect, type Locator, type Page } from "@playwright/test";
+import { ADMIN_ID } from "~/constants";
 import type { SeedVariation } from "~/features/api/routes/seed";
 
 export async function selectWeapon({
@@ -63,7 +64,7 @@ export function seed(page: Page, variation?: SeedVariation) {
   });
 }
 
-export function impersonate(page: Page, userId = 1) {
+export function impersonate(page: Page, userId = ADMIN_ID) {
   return page.request.post(`/auth/impersonate?id=${userId}`);
 }
 
diff --git a/e2e/analyzer.spec.ts b/e2e/analyzer.spec.ts
index ba015a077..671ce15f6 100644
--- a/e2e/analyzer.spec.ts
+++ b/e2e/analyzer.spec.ts
@@ -13,7 +13,7 @@ test.describe("Build Analyzer", () => {
     page,
   }) => {
     await seed(page);
-    await impersonate(page, 1);
+    await impersonate(page);
     await navigate({ page, url: ANALYZER_URL });
 
     const newBuildPrompt = page.getByTestId("new-build-prompt");
diff --git a/e2e/team.spec.ts b/e2e/team.spec.ts
index 571ee1fdd..98c28e5af 100644
--- a/e2e/team.spec.ts
+++ b/e2e/team.spec.ts
@@ -1,4 +1,6 @@
 import { expect, test } from "@playwright/test";
+import { ADMIN_ID } from "~/constants";
+import { NZAP_TEST_ID } from "~/db/seed/constants";
 import {
   navigate,
   seed,
@@ -30,7 +32,7 @@ test.describe("Team search page", () => {
 
   test("creates new team", async ({ page }) => {
     await seed(page);
-    await impersonate(page, 2);
+    await impersonate(page, NZAP_TEST_ID);
     await navigate({ page, url: TEAM_SEARCH_PAGE });
 
     await page.getByTestId("new-team-button").click();
@@ -45,7 +47,7 @@ test.describe("Team search page", () => {
 test.describe("Team page", () => {
   test("edit team info", async ({ page }) => {
     await seed(page);
-    await impersonate(page, 1);
+    await impersonate(page, ADMIN_ID);
     await navigate({ page, url: teamPage("alliance-rogue") });
 
     await page.getByTestId("edit-team-button").click();
@@ -71,7 +73,7 @@ test.describe("Team page", () => {
 
   test("manages roster", async ({ page }) => {
     await seed(page);
-    await impersonate(page, 1);
+    await impersonate(page, ADMIN_ID);
     await navigate({ page, url: teamPage("alliance-rogue") });
 
     await page.getByTestId("manage-roster-button").click();
@@ -79,8 +81,7 @@ test.describe("Team page", () => {
     await page.getByTestId("role-select-0").selectOption("SUPPORT");
 
     await page.getByTestId("member-row-3").isVisible();
-    // kick-button-0 is self
-    await page.getByTestId("kick-button-1").click();
+    await page.getByTestId("kick-button").last().click();
     await modalClickConfirmButton(page);
     await isNotVisible(page.getByTestId("member-row-3"));
 
@@ -95,7 +96,7 @@ test.describe("Team page", () => {
 
   test("deletes team", async ({ page }) => {
     await seed(page);
-    await impersonate(page, 1);
+    await impersonate(page, ADMIN_ID);
 
     await navigate({ page, url: TEAM_SEARCH_PAGE });
     const firstTeamName = page.getByTestId("team-0");
@@ -111,7 +112,7 @@ test.describe("Team page", () => {
 
   test("resets invite code, joins team, leaves, rejoins", async ({ page }) => {
     await seed(page);
-    await impersonate(page, 1);
+    await impersonate(page, ADMIN_ID);
     await navigate({ page, url: teamPage("alliance-rogue") });
 
     await page.getByTestId("manage-roster-button").click();
@@ -123,7 +124,7 @@ test.describe("Team page", () => {
     await expect(page.getByTestId("invite-link")).not.toHaveText(oldInviteLink);
     const newInviteLink = await page.getByTestId("invite-link").innerText();
 
-    await impersonate(page, 2);
+    await impersonate(page, NZAP_TEST_ID);
 
     await navigate({ page, url: newInviteLink });
     await submit(page);
diff --git a/e2e/tournament-bracket.spec.ts b/e2e/tournament-bracket.spec.ts
index 34c09481d..361f7632b 100644
--- a/e2e/tournament-bracket.spec.ts
+++ b/e2e/tournament-bracket.spec.ts
@@ -131,7 +131,7 @@ test.describe("Tournament bracket", () => {
     await expectScore(page, [1, 0]);
 
     // 7)
-    await impersonate(page, 2);
+    await impersonate(page, NZAP_TEST_ID);
     await navigate({
       page,
       url: tournamentBracketsPage(tournamentId),
diff --git a/e2e/tournament.spec.ts b/e2e/tournament.spec.ts
index 43e5b84b0..d7f2a2fe0 100644
--- a/e2e/tournament.spec.ts
+++ b/e2e/tournament.spec.ts
@@ -1,5 +1,7 @@
 import { expect, test } from "@playwright/test";
 import invariant from "tiny-invariant";
+import { ADMIN_ID } from "~/constants";
+import { NZAP_TEST_ID } from "~/db/seed/constants";
 import type { TournamentLoaderData } from "~/features/tournament";
 import { rankedModesShort } from "~/modules/in-game-lists/modes";
 import {
@@ -114,7 +116,7 @@ test.describe("Tournament", () => {
 
     // Change team owner
     let data = await fetchTournamentLoaderData();
-    expect(getIsOwnerOfUser({ data, userId: 1, teamId: 1 })).toBe(1);
+    expect(getIsOwnerOfUser({ data, userId: ADMIN_ID, teamId: 1 })).toBe(1);
 
     await actionSelect.selectOption("CHANGE_TEAM_OWNER");
     await teamSelect.selectOption("1");
@@ -122,8 +124,8 @@ test.describe("Tournament", () => {
     await submit(page);
 
     data = await fetchTournamentLoaderData();
-    expect(getIsOwnerOfUser({ data, userId: 1, teamId: 1 })).toBe(0);
-    expect(getIsOwnerOfUser({ data, userId: 2, teamId: 1 })).toBe(1);
+    expect(getIsOwnerOfUser({ data, userId: ADMIN_ID, teamId: 1 })).toBe(0);
+    expect(getIsOwnerOfUser({ data, userId: NZAP_TEST_ID, teamId: 1 })).toBe(1);
 
     // Check in team
     expect(getTeamCheckedInAt({ data, teamId: 1 })).toBeFalsy();
diff --git a/package.json b/package.json
index c605a8b3a..e54d4443f 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "deploy": "npm ci && npm run build",
     "build": "remix build",
-    "dev": "cross-env NODE_ENV=development remix dev",
+    "dev": "remix dev",
+    "dev:prod": "cross-env DB_PATH=db-prod.sqlite3 remix dev",
     "dev:ci": "cp .env.example .env && npm run migrate up && npm run dev",
     "start": "npm run migrate up && remix-serve build",
     "migrate": "ley",