diff --git a/src/auth.ts b/src/auth.ts
index 2924b0b..f733153 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -56,6 +56,5 @@ export const auth = betterAuth({
 });
 
 export const { signIn, signOut, useSession, ...client } = createAuthClient({
-  baseURL: "http://localhost:3000",
   plugins: [genericOAuthClient()],
 });
diff --git a/src/features/content/apis/jellyfin.ts b/src/features/content/apis/jellyfin.ts
index 67b5da8..4e449b6 100644
--- a/src/features/content/apis/jellyfin.ts
+++ b/src/features/content/apis/jellyfin.ts
@@ -3,14 +3,23 @@ import type { paths } from "./jellyfin.generated"; // generated by openapi-types
 import { query } from "@solidjs/router";
 import { Entry } from "../types";
 
-const baseUrl = "http://ulmo:8096/";
+const baseUrl = process.env.JELLYFIN_BASE_URL;
 const client = createClient<paths>({
   baseUrl,
   headers: {
-    Authorization: `MediaBrowser DeviceId="Streamarr", Token="b3c44db1e31f4349b19d1ff0bc487da2"`,
+    Authorization: `MediaBrowser DeviceId="Streamarr", Token="${process.env.JELLYFIN_API_KEY}"`,
   },
 });
 
+export const listUsers = query(async () => {
+  const { data, error } = await client.GET("/Users", {
+    params: {
+    },
+  });
+
+  return data ?? [];
+}, "jellyfin.listUsers");
+
 export const getItem = query(async (userId: string, itemId: string) => {
   const { data, error } = await client.GET("/Items/{itemId}", {
     params: {
diff --git a/src/features/content/service.ts b/src/features/content/service.ts
index ad2533f..bcabb8f 100644
--- a/src/features/content/service.ts
+++ b/src/features/content/service.ts
@@ -70,4 +70,4 @@ export const getEntry = query(
   "series.get",
 );
 
-export { getContinueWatching } from "./apis/jellyfin";
+export { listUsers, getItem, getContinueWatching } from "./apis/jellyfin";
diff --git a/src/routes/(shell)/index.tsx b/src/routes/(shell)/index.tsx
index 1db28a4..70e3591 100644
--- a/src/routes/(shell)/index.tsx
+++ b/src/routes/(shell)/index.tsx
@@ -29,11 +29,11 @@ export default function Home() {
     <>
       <Title>Home</Title>
 
-      <Show when={continueWatching()}>
-        <List label="Continue watching" items={continueWatching()}>
+      <Show when={continueWatching()}>{
+        entries => <List label="Continue watching" items={entries()}>
           {(item) => <ListItem entry={item()} />}
         </List>
-      </Show>
+      }</Show>
 
       <Show when={highlight() && categories()}>
         <Overview highlight={highlight()!} categories={categories()!} />