diff --git a/src/api.ts b/src/api.ts
index 9f1f9d0..7cafdc2 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -1,6 +1,18 @@
 import { AuthenticatedAPI } from "./api/authenticated_api";
 import { BlueskyAPI, HiddenRepliesError, URLError } from "./api/bluesky_api";
 import { APIError, Minisky } from "./api/minisky";
+import { settings } from "./models/settings.svelte";
 
 export { AuthenticatedAPI, BlueskyAPI, Minisky };
 export { APIError, HiddenRepliesError, URLError };
+
+export let appView = new BlueskyAPI('api.bsky.app');
+export let blueAPI = new BlueskyAPI('blue.mackuba.eu');
+export let accountAPI = new AuthenticatedAPI();
+export let api: BlueskyAPI;
+
+export function setAPI() {
+   api = (accountAPI.isLoggedIn && !settings.incognitoMode) ? accountAPI : appView;
+}
+
+setAPI();
diff --git a/src/api/authenticated_api.ts b/src/api/authenticated_api.ts
index 0ccb27f..7486770 100644
--- a/src/api/authenticated_api.ts
+++ b/src/api/authenticated_api.ts
@@ -27,9 +27,9 @@ class LocalStorageConfig {
 export class AuthenticatedAPI extends BlueskyAPI {
   user: json;
 
-  constructor(host?: string | null | undefined) {
+  constructor() {
     let config = new LocalStorageConfig();
-    let pds: string | null = host || config.user.pdsEndpoint || null;
+    let pds: string | null = config.user.pdsEndpoint || null;
     super(pds, config);
     this.user = config.user;
   }
diff --git a/src/api/bluesky_api.ts b/src/api/bluesky_api.ts
index b5e94d1..7fba91b 100644
--- a/src/api/bluesky_api.ts
+++ b/src/api/bluesky_api.ts
@@ -1,4 +1,5 @@
 import { HandleCache } from './handle_cache.js';
+import { blueAPI, appView } from '../api.js';
 import { APIError, Minisky, type FetchAllOnPageLoad, type MiniskyConfig, type MiniskyOptions } from './minisky.js';
 import { atURI, feedPostTime } from '../utils.js';
 import { Post } from '../models/posts.js';
diff --git a/src/api/identity.ts b/src/api/identity.ts
index a545417..e107483 100644
--- a/src/api/identity.ts
+++ b/src/api/identity.ts
@@ -1,3 +1,4 @@
+import { appView } from '../api.js';
 import { APIError } from './minisky.js';
 
 /**
diff --git a/src/components/UserAutocomplete.svelte b/src/components/UserAutocomplete.svelte
index b1002d4..72ba3be 100644
--- a/src/components/UserAutocomplete.svelte
+++ b/src/components/UserAutocomplete.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import { api } from '../api.js';
+
   export type AutocompleteUser = {
     did: string;
     handle: string;
@@ -61,7 +63,7 @@
   }
 
   async function fetchAutocomplete(query: string) {
-    let users = await accountAPI.autocompleteUsers(query) as AutocompleteUser[];
+    let users = await api.autocompleteUsers(query) as AutocompleteUser[];
 
     let selectedDIDs = new Set(selectedUserDIDs);
     users = users.filter(u => !selectedDIDs.has(u.did));
diff --git a/src/components/embeds/QuoteComponent.svelte b/src/components/embeds/QuoteComponent.svelte
index f22a9cf..04e1342 100644
--- a/src/components/embeds/QuoteComponent.svelte
+++ b/src/components/embeds/QuoteComponent.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { api } from '../../api.js';
   import { getPostContext } from '../posts/PostComponent.svelte';
   import { BasePost, Post, MissingPost } from '../../models/posts.js';
   import { InlineRecordEmbed, InlineRecordWithMediaEmbed } from '../../models/embeds.js';
diff --git a/src/components/posts/BlockedPostView.svelte b/src/components/posts/BlockedPostView.svelte
index 65f9481..585bff2 100644
--- a/src/components/posts/BlockedPostView.svelte
+++ b/src/components/posts/BlockedPostView.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { api } from '../../api.js';
   import { BlockedPost, DetachedQuotePost, MissingPost, Post } from '../../models/posts.js';
   import { settings } from '../../models/settings.svelte.js';
 
diff --git a/src/components/posts/FeedPostParent.svelte b/src/components/posts/FeedPostParent.svelte
index 074d7ea..83911e6 100644
--- a/src/components/posts/FeedPostParent.svelte
+++ b/src/components/posts/FeedPostParent.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { accountAPI, api } from '../../api.js';
   import { linkToPostById } from '../../router.js';
   import { atURI } from '../../utils.js';
 
diff --git a/src/components/posts/HiddenRepliesLink.svelte b/src/components/posts/HiddenRepliesLink.svelte
index 018b239..8b93e72 100644
--- a/src/components/posts/HiddenRepliesLink.svelte
+++ b/src/components/posts/HiddenRepliesLink.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { api } from '../../api.js';
   import { showBiohazardDialog } from '../../skythread.js';
   import { settings } from '../../models/settings.svelte.js';
   import { parseThreadPost } from '../../models/posts.js';
diff --git a/src/components/posts/LoadMoreLink.svelte b/src/components/posts/LoadMoreLink.svelte
index f17a77d..aef19d7 100644
--- a/src/components/posts/LoadMoreLink.svelte
+++ b/src/components/posts/LoadMoreLink.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { api } from '../../api.js';
   import { Post, parseThreadPost } from '../../models/posts.js';
   import { linkToPostThread } from '../../router.js';
   import { getPostContext } from './PostComponent.svelte';
diff --git a/src/components/posts/PostFooter.svelte b/src/components/posts/PostFooter.svelte
index 4c0c5e4..9846ee9 100644
--- a/src/components/posts/PostFooter.svelte
+++ b/src/components/posts/PostFooter.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { accountAPI } from '../../api.js';
   import { getPostContext } from './PostComponent.svelte';
   import { linkToPostThread, linkToQuotesPage } from '../../router.js';
   import { account } from '../../models/account.svelte.js';
diff --git a/src/components/posts/ReferencedPostAuthorLink.svelte b/src/components/posts/ReferencedPostAuthorLink.svelte
index e918e9e..dac3de5 100644
--- a/src/components/posts/ReferencedPostAuthorLink.svelte
+++ b/src/components/posts/ReferencedPostAuthorLink.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Post } from '../../models/posts.js';
+  import { api } from '../../api.js';
   import { atURI } from '../../utils.js';
 
   let { post, status = undefined }: { post: AnyPost, status?: string | undefined } = $props();
diff --git a/src/components/posts/ThreadRootParentRaw.svelte b/src/components/posts/ThreadRootParentRaw.svelte
index 0368897..76ec42e 100644
--- a/src/components/posts/ThreadRootParentRaw.svelte
+++ b/src/components/posts/ThreadRootParentRaw.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { api } from '../../api.js';
   import { linkToPostById } from '../../router.js';
   import { atURI } from '../../utils.js';
 
diff --git a/src/models/account.svelte.ts b/src/models/account.svelte.ts
index 3ed4e8c..466583a 100644
--- a/src/models/account.svelte.ts
+++ b/src/models/account.svelte.ts
@@ -1,4 +1,4 @@
-import { AuthenticatedAPI } from '../api/authenticated_api.js';
+import { accountAPI, setAPI } from '../api.js';
 import { pdsEndpointForIdentifier } from '../api/identity.js';
 import { settings } from './settings.svelte.js';
 
@@ -8,8 +8,6 @@ class Account {
   #avatarIsLoading: boolean;
 
   constructor() {
-    let accountAPI = new AuthenticatedAPI();
-
     this.#loggedIn = $state(accountAPI.isLoggedIn);
     this.#avatarURL = $state(accountAPI.isLoggedIn ? accountAPI.user.avatar : undefined);
     this.#avatarIsLoading = $state(false);
@@ -36,28 +34,27 @@ class Account {
     return this.#avatarIsLoading;
   }
 
-  async logIn(identifier: string, password: string): Promise<AuthenticatedAPI> {
+  async logIn(identifier: string, password: string) {
     let pdsEndpoint = await pdsEndpointForIdentifier(identifier);
 
-    let pdsAPI = new AuthenticatedAPI(pdsEndpoint);
-    await pdsAPI.logIn(identifier, password);
+    accountAPI.host = pdsEndpoint;
+    await accountAPI.logIn(identifier, password);
 
     this.#loggedIn = true;
     this.#avatarIsLoading = true;
+    setAPI();
 
-    pdsAPI.loadCurrentUserAvatar().then(url => {
+    accountAPI.loadCurrentUserAvatar().then(url => {
       this.#avatarURL = url || undefined;
     }).catch(error => {
       console.log(error);
     }).finally(() => {
       this.#avatarIsLoading = false;
     });
-
-    return pdsAPI;
   }
 
   logOut() {
-    window.accountAPI.resetTokens();
+    accountAPI.resetTokens();
     settings.logOut();
     location.reload();
   }
diff --git a/src/models/posts.js b/src/models/posts.js
index 495dca3..23a3a36 100644
--- a/src/models/posts.js
+++ b/src/models/posts.js
@@ -1,3 +1,4 @@
+import { api } from '../api.js';
 import { atURI, castToInt } from '../utils.js';
 import { ATProtoRecord, FeedGeneratorRecord, StarterPackRecord, UserListRecord } from './records.js';
 import { Embed } from './embeds.js';
diff --git a/src/pages/HashtagPage.svelte b/src/pages/HashtagPage.svelte
index dbbf63d..c751dbc 100644
--- a/src/pages/HashtagPage.svelte
+++ b/src/pages/HashtagPage.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { api } from '../api.js';
   import { Post } from '../models/posts.js';
   import * as paginator from '../utils/paginator.js';
   import MainLoader from '../components/MainLoader.svelte';
diff --git a/src/pages/NotificationsPage.svelte b/src/pages/NotificationsPage.svelte
index de5b40b..b77cfb6 100644
--- a/src/pages/NotificationsPage.svelte
+++ b/src/pages/NotificationsPage.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { accountAPI } from '../api.js';
   import { Post } from '../models/posts.js';
   import * as paginator from '../utils/paginator.js';
   import FeedPostParent from '../components/posts/FeedPostParent.svelte';
diff --git a/src/pages/PostingStatsPage.svelte b/src/pages/PostingStatsPage.svelte
index d8973f6..e6845d0 100644
--- a/src/pages/PostingStatsPage.svelte
+++ b/src/pages/PostingStatsPage.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import UserAutocomplete, { type AutocompleteUser } from '../components/UserAutocomplete.svelte';
   import PostingStatsTable from '../components/PostingStatsTable.svelte';
+  import { accountAPI } from '../api.js';
   import { PostingStats, type PostingStatsResult } from '../services/posting_stats.js';
   import { numberOfDays } from '../utils.js';
 
diff --git a/src/pages/QuotesPage.svelte b/src/pages/QuotesPage.svelte
index 602c62c..f55e242 100644
--- a/src/pages/QuotesPage.svelte
+++ b/src/pages/QuotesPage.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { api, blueAPI } from '../api.js';
   import { Post } from '../models/posts.js';
   import { showError } from '../utils.js';
   import * as paginator from '../utils/paginator.js';
diff --git a/src/pages/ThreadPage.svelte b/src/pages/ThreadPage.svelte
index 99d91e5..600803f 100644
--- a/src/pages/ThreadPage.svelte
+++ b/src/pages/ThreadPage.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { api, blueAPI } from '../api.js';
   import { Post, parseThreadPost } from '../models/posts.js';
   import { showError } from '../utils.js';
   import MainLoader from '../components/MainLoader.svelte';
diff --git a/src/services/like_stats.ts b/src/services/like_stats.ts
index 0357cba..b057ad3 100644
--- a/src/services/like_stats.ts
+++ b/src/services/like_stats.ts
@@ -1,5 +1,5 @@
 import { atURI, feedPostTime } from '../utils.js';
-import { BlueskyAPI } from '../api.js';
+import { BlueskyAPI, accountAPI } from '../api.js';
 
 export type LikeStatsResponse = { givenLikes: LikeStat[], receivedLikes: LikeStat[] }
 export type LikeStat = { handle?: string, did?: string, avatar?: string, count: number }
@@ -36,7 +36,7 @@ export class LikeStats {
     let givenStats = this.sumUpGivenLikes(givenLikes);
     let topGiven = this.getTopEntries(givenStats);
 
-    let profileInfo = await appView.getRequest('app.bsky.actor.getProfiles', { actors: topGiven.map(x => x.did) });
+    let profileInfo = await this.appView.getRequest('app.bsky.actor.getProfiles', { actors: topGiven.map(x => x.did) });
 
     for (let profile of profileInfo.profiles) {
       let user = topGiven.find(x => x.did == profile.did)!;
diff --git a/src/services/lycan.ts b/src/services/lycan.ts
index c4a1512..61d3dbe 100644
--- a/src/services/lycan.ts
+++ b/src/services/lycan.ts
@@ -1,6 +1,6 @@
 import { Post } from '../models/posts.js';
 import * as paginator from '../utils/paginator.js';
-import { BlueskyAPI } from '../api.js';
+import { BlueskyAPI, accountAPI } from '../api.js';
 
 export type OnPostsLoaded = (data: { posts: Post[], terms: string[] }) => void
 export type OnFinish = () => void
diff --git a/src/services/posting_stats.ts b/src/services/posting_stats.ts
index 22b95e2..c35b7f5 100644
--- a/src/services/posting_stats.ts
+++ b/src/services/posting_stats.ts
@@ -1,4 +1,4 @@
-import { BlueskyAPI } from '../api.js';
+import { BlueskyAPI, accountAPI } from '../api.js';
 import { feedPostTime } from '../utils.js';
 
 /**
diff --git a/src/services/timeline_search.ts b/src/services/timeline_search.ts
index 3e018b3..bc104e7 100644
--- a/src/services/timeline_search.ts
+++ b/src/services/timeline_search.ts
@@ -1,3 +1,4 @@
+import { accountAPI } from '../api.js';
 import { Post, parseFeedPost } from '../models/posts.js';
 import { feedPostTime } from '../utils.js';
 
diff --git a/src/skythread.js b/src/skythread.js
index 68d6234..4526f2b 100644
--- a/src/skythread.js
+++ b/src/skythread.js
@@ -13,7 +13,7 @@ import TimelineSearchPage from './pages/TimelineSearchPage.svelte';
 import ThreadPage from './pages/ThreadPage.svelte';
 
 import { $id } from './utils.js';
-import { AuthenticatedAPI, BlueskyAPI } from './api.js';
+import { BlueskyAPI, accountAPI } from './api.js';
 import { account } from './models/account.svelte.js';
 import { Lycan, DevLycan } from './services/lycan.js';
 
@@ -43,11 +43,6 @@ function init() {
     });
   }
 
-  window.appView = new BlueskyAPI('api.bsky.app');
-  window.blueAPI = new BlueskyAPI('blue.mackuba.eu');
-  window.accountAPI = new AuthenticatedAPI();
-  window.api = (accountAPI.isLoggedIn && !account.isIncognito) ? accountAPI : appView;
-
   parseQueryParams();
 }
 
@@ -172,10 +167,7 @@ function hideBiohazardDialog() {
 /** @param {string} identifier, @param {string} password, @returns {Promise<void>} */
 
 async function submitLogin(identifier, password) {
-  let pds = await account.logIn(identifier, password);
-
-  window.api = pds;
-  window.accountAPI = pds;
+  await account.logIn(identifier, password);
 
   hideLoginDialog();
 
diff --git a/src/types.d.ts b/src/types.d.ts
index 20c72ab..c56f07d 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -5,11 +5,6 @@ interface Window {
   BlueskyAPI: typeof import("./api/bluesky_api.js").BlueskyAPI;
 }
 
-declare var accountAPI: import("./api/authenticated_api.js").AuthenticatedAPI;
-declare var blueAPI: import("./api/bluesky_api.js").BlueskyAPI;
-declare var appView: import("./api/bluesky_api.js").BlueskyAPI;
-declare var api: import("./api/bluesky_api.js").BlueskyAPI;
-
 type json = Record<string, any>;
 
 type AnyPost = import("./models/posts.js").Post