diff --git a/backend/config/__init__.py b/backend/config/__init__.py
index f2320924d..9ad9d09f4 100644
--- a/backend/config/__init__.py
+++ b/backend/config/__init__.py
@@ -50,6 +50,7 @@
 ROMM_AUTH_SECRET_KEY: Final = os.environ.get(
     "ROMM_AUTH_SECRET_KEY", secrets.token_hex(32)
 )
+DISABLE_CSRF_PROTECTION = os.environ.get("DISABLE_CSRF_PROTECTION", "false") == "true"
 
 # TASKS
 ENABLE_RESCAN_ON_FILESYSTEM_CHANGE: Final = (
diff --git a/backend/endpoints/auth.py b/backend/endpoints/auth.py
index c9a058ced..ed6448569 100644
--- a/backend/endpoints/auth.py
+++ b/backend/endpoints/auth.py
@@ -1,4 +1,3 @@
-import secrets
 from datetime import timedelta
 from typing import Annotated, Final
 
@@ -9,7 +8,6 @@
 from fastapi import APIRouter, Depends, HTTPException, Request, status
 from fastapi.security.http import HTTPBasic
 from handler import auth_handler, oauth_handler
-from handler.redis_handler import cache
 
 ACCESS_TOKEN_EXPIRE_MINUTES: Final = 30
 REFRESH_TOKEN_EXPIRE_DAYS: Final = 7
@@ -45,7 +43,9 @@ async def token(form_data: Annotated[OAuth2RequestForm, Depends()]) -> TokenResp
                 status_code=status.HTTP_400_BAD_REQUEST, detail="Missing refresh token"
             )
 
-        user, payload = await oauth_handler.get_current_active_user_from_bearer_token(token)
+        user, payload = await oauth_handler.get_current_active_user_from_bearer_token(
+            token
+        )
         if payload.get("type") != "refresh":
             raise HTTPException(
                 status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid refresh token"
@@ -54,6 +54,7 @@ async def token(form_data: Annotated[OAuth2RequestForm, Depends()]) -> TokenResp
         access_token = oauth_handler.create_oauth_token(
             data={
                 "sub": user.username,
+                "iss": "romm:oauth",
                 "scopes": payload.get("scopes"),
                 "type": "access",
             },
@@ -105,6 +106,7 @@ async def token(form_data: Annotated[OAuth2RequestForm, Depends()]) -> TokenResp
     access_token = oauth_handler.create_oauth_token(
         data={
             "sub": user.username,
+            "iss": "romm:oauth",
             "scopes": " ".join(form_data.scopes),
             "type": "access",
         },
@@ -114,6 +116,7 @@ async def token(form_data: Annotated[OAuth2RequestForm, Depends()]) -> TokenResp
     refresh_token = oauth_handler.create_oauth_token(
         data={
             "sub": user.username,
+            "iss": "romm:oauth",
             "scopes": " ".join(form_data.scopes),
             "type": "refresh",
         },
@@ -151,9 +154,7 @@ def login(request: Request, credentials=Depends(HTTPBasic())) -> MessageResponse
     if not user.enabled:
         raise DisabledException
 
-    # Generate unique session key and store in cache
-    request.session["session_id"] = secrets.token_hex(16)
-    cache.set(f'romm:{request.session["session_id"]}', user.username)  # type: ignore[attr-defined]
+    request.session.update({"iss": "romm:auth", "sub": user.username})
 
     return {"msg": "Successfully logged in"}
 
@@ -169,14 +170,6 @@ def logout(request: Request) -> MessageResponse:
         MessageResponse: Standard message response
     """
 
-    # Check if session key already stored in cache
-    session_id = request.session.get("session_id")
-    if not session_id:
-        return {"msg": "Already logged out"}
-
-    if not request.user.is_authenticated:
-        return {"msg": "Already logged out"}
-
-    auth_handler.clear_session(request)
+    request.session.clear()
 
     return {"msg": "Successfully logged out"}
diff --git a/backend/endpoints/tests/conftest.py b/backend/endpoints/tests/conftest.py
index 441b5e892..038377189 100644
--- a/backend/endpoints/tests/conftest.py
+++ b/backend/endpoints/tests/conftest.py
@@ -10,6 +10,7 @@
 def access_token(admin_user):  # noqa
     data = {
         "sub": admin_user.username,
+        "iss": "romm:oauth",
         "scopes": " ".join(admin_user.oauth_scopes),
         "type": "access",
     }
@@ -23,6 +24,7 @@ def access_token(admin_user):  # noqa
 def refresh_token(admin_user):  # noqa
     data = {
         "sub": admin_user.username,
+        "iss": "romm:oauth",
         "scopes": " ".join(admin_user.oauth_scopes),
         "type": "refresh",
     }
diff --git a/backend/endpoints/user.py b/backend/endpoints/user.py
index 3dca29102..4f383e786 100644
--- a/backend/endpoints/user.py
+++ b/backend/endpoints/user.py
@@ -1,4 +1,3 @@
-import os
 from pathlib import Path
 from typing import Annotated
 
diff --git a/backend/handler/auth_handler/__init__.py b/backend/handler/auth_handler/__init__.py
index e49ef2f0f..4dd9af1a5 100644
--- a/backend/handler/auth_handler/__init__.py
+++ b/backend/handler/auth_handler/__init__.py
@@ -7,8 +7,7 @@
     ROMM_AUTH_USERNAME,
 )
 from exceptions.auth_exceptions import OAuthCredentialsException
-from fastapi import HTTPException, Request, status
-from handler.redis_handler import cache
+from fastapi import HTTPException, status
 from jose import JWTError, jwt
 from passlib.context import CryptContext
 from sqlalchemy.exc import IntegrityError
@@ -52,12 +51,6 @@ def verify_password(self, plain_password, hashed_password):
     def get_password_hash(self, password):
         return self.pwd_context.hash(password)
 
-    def clear_session(self, req: HTTPConnection | Request):
-        session_id = req.session.get("session_id")
-        if session_id:
-            cache.delete(f"romm:{session_id}")  # type: ignore[attr-defined]
-            req.session["session_id"] = None
-
     def authenticate_user(self, username: str, password: str):
         from handler import db_user_handler
 
@@ -72,20 +65,19 @@ def authenticate_user(self, username: str, password: str):
 
     async def get_current_active_user_from_session(self, conn: HTTPConnection):
         from handler import db_user_handler
-
-        # Check if session key already stored in cache
-        session_id = conn.session.get("session_id")
-        if not session_id:
+        
+        issuer = conn.session.get('iss')
+        if not issuer or issuer != 'romm:auth':
             return None
 
-        username = cache.get(f"romm:{session_id}")  # type: ignore[attr-defined]
+        username = conn.session.get('sub')
         if not username:
             return None
 
         # Key exists therefore user is probably authenticated
         user = db_user_handler.get_user_by_username(username)
         if user is None:
-            self.clear_session(conn)
+            conn.session.clear()
 
             raise HTTPException(
                 status_code=status.HTTP_403_FORBIDDEN,
@@ -93,7 +85,7 @@ async def get_current_active_user_from_session(self, conn: HTTPConnection):
             )
 
         if not user.enabled:
-            self.clear_session(conn)
+            conn.session.clear()
 
             raise HTTPException(
                 status_code=status.HTTP_403_FORBIDDEN, detail="Inactive user"
@@ -140,6 +132,10 @@ async def get_current_active_user_from_bearer_token(self, token: str):
             payload = jwt.decode(token, ROMM_AUTH_SECRET_KEY, algorithms=[ALGORITHM])
         except JWTError:
             raise OAuthCredentialsException
+        
+        issuer = payload.get('iss')
+        if not issuer or issuer != 'romm:oauth':
+            return None
 
         username = payload.get("sub")
         if username is None:
diff --git a/backend/handler/auth_handler/tests/test_auth.py b/backend/handler/auth_handler/tests/test_auth.py
index 04821ed0e..8d38192f0 100644
--- a/backend/handler/auth_handler/tests/test_auth.py
+++ b/backend/handler/auth_handler/tests/test_auth.py
@@ -6,7 +6,6 @@
 from handler import auth_handler, oauth_handler, db_user_handler
 from handler.auth_handler import WRITE_SCOPES
 from handler.auth_handler.hybrid_auth import HybridAuthBackend
-from handler.redis_handler import cache
 
 
 def test_verify_password():
@@ -14,20 +13,17 @@ def test_verify_password():
     assert not auth_handler.verify_password("password", auth_handler.get_password_hash("notpassword"))
 
 
-def test_authenticate_user(admin_user):
+def test_authenticate_user(admin_user: User):
     current_user = auth_handler.authenticate_user("test_admin", "test_admin_password")
 
     assert current_user
     assert current_user.id == admin_user.id
 
 
-async def test_get_current_active_user_from_session(editor_user):
-    session_id = "test_session_id"
-    cache.set(f"romm:{session_id}", editor_user.username)
-
+async def test_get_current_active_user_from_session(editor_user: User):
     class MockConnection:
         def __init__(self):
-            self.session = {"session_id": session_id}
+            self.session = {"iss": "romm:auth", "sub": editor_user.username}
 
     conn = MockConnection()
     current_user = await auth_handler.get_current_active_user_from_session(conn)
@@ -37,28 +33,10 @@ def __init__(self):
     assert current_user.id == editor_user.id
 
 
-async def test_get_current_active_user_from_session_bad_session_key(editor_user):
-    cache.set("romm:test_session_id", editor_user.username)
-
+async def test_get_current_active_user_from_session_bad_username(editor_user: User):
     class MockConnection:
         def __init__(self):
-            self.session = {"session_id": "not_real_test_session_id"}
-            self.headers = {}
-
-    conn = MockConnection()
-    current_user = await auth_handler.get_current_active_user_from_session(conn)
-
-    assert not current_user
-
-
-async def test_get_current_active_user_from_session_bad_username(editor_user):
-    session_id = "test_session_id"
-    cache.set(f"romm:{session_id}", "not_real_username")
-
-    class MockConnection:
-        def __init__(self):
-            self.session = {"session_id": session_id}
-            self.headers = {}
+            self.session = {"iss": "romm:auth", "sub": "not_real_username"}
 
     conn = MockConnection()
 
@@ -69,13 +47,10 @@ def __init__(self):
         assert e.detail == "User not found"
 
 
-async def test_get_current_active_user_from_session_disabled_user(editor_user):
-    session_id = "test_session_id"
-    cache.set(f"romm:{session_id}", editor_user.username)
-
+async def test_get_current_active_user_from_session_disabled_user(editor_user: User):
     class MockConnection:
         def __init__(self):
-            self.session = {"session_id": session_id}
+            self.session = {"iss": "romm:auth", "sub": editor_user.username}
             self.headers = {}
 
     conn = MockConnection()
@@ -105,13 +80,10 @@ def test_create_default_admin_user():
     assert len(users) == 1
 
 
-async def test_hybrid_auth_backend_session(editor_user):
-    session_id = "test_session_id"
-    cache.set(f"romm:{session_id}", editor_user.username)
-
+async def test_hybrid_auth_backend_session(editor_user: User):
     class MockConnection:
         def __init__(self):
-            self.session = {"session_id": session_id}
+            self.session = {"iss": "romm:auth", "sub": editor_user.username}
 
     backend = HybridAuthBackend()
     conn = MockConnection()
@@ -123,7 +95,7 @@ def __init__(self):
     assert creds.scopes == WRITE_SCOPES
 
 
-async def test_hybrid_auth_backend_empty_session_and_headers(editor_user):
+async def test_hybrid_auth_backend_empty_session_and_headers(editor_user: User):
     class MockConnection:
         def __init__(self):
             self.session = {}
@@ -138,10 +110,11 @@ def __init__(self):
     assert creds.scopes == []
 
 
-async def test_hybrid_auth_backend_bearer_auth_header(editor_user):
+async def test_hybrid_auth_backend_bearer_auth_header(editor_user: User):
     access_token = oauth_handler.create_oauth_token(
         data={
             "sub": editor_user.username,
+            "iss": "romm:oauth",
             "scopes": " ".join(editor_user.oauth_scopes),
             "type": "access",
         },
@@ -161,7 +134,7 @@ def __init__(self):
     assert set(creds.scopes).issubset(editor_user.oauth_scopes)
 
 
-async def test_hybrid_auth_backend_bearer_invalid_token(editor_user):
+async def test_hybrid_auth_backend_bearer_invalid_token(editor_user: User):
     class MockConnection:
         def __init__(self):
             self.session = {}
@@ -174,7 +147,7 @@ def __init__(self):
         await backend.authenticate(conn)
 
 
-async def test_hybrid_auth_backend_basic_auth_header(editor_user):
+async def test_hybrid_auth_backend_basic_auth_header(editor_user: User):
     token = b64encode("test_editor:test_editor_password".encode()).decode()
 
     class MockConnection:
@@ -192,7 +165,7 @@ def __init__(self):
     assert set(creds.scopes).issubset(editor_user.oauth_scopes)
 
 
-async def test_hybrid_auth_backend_basic_auth_header_unencoded(editor_user):
+async def test_hybrid_auth_backend_basic_auth_header_unencoded(editor_user: User):
     class MockConnection:
         def __init__(self):
             self.session = {}
@@ -220,10 +193,11 @@ def __init__(self):
     assert creds.scopes == []
 
 
-async def test_hybrid_auth_backend_with_refresh_token(editor_user):
+async def test_hybrid_auth_backend_with_refresh_token(editor_user: User):
     refresh_token = oauth_handler.create_oauth_token(
         data={
             "sub": editor_user.username,
+            "iss": "romm:oauth",
             "scopes": " ".join(editor_user.oauth_scopes),
             "type": "refresh",
         },
@@ -243,11 +217,12 @@ def __init__(self):
     assert creds.scopes == []
 
 
-async def test_hybrid_auth_backend_scope_subset(editor_user):
+async def test_hybrid_auth_backend_scope_subset(editor_user: User):
     scopes = editor_user.oauth_scopes[:3]
     access_token = oauth_handler.create_oauth_token(
         data={
             "sub": editor_user.username,
+            "iss": "romm:oauth",
             "scopes": " ".join(scopes),
             "type": "access",
         },
diff --git a/backend/handler/auth_handler/tests/test_oauth.py b/backend/handler/auth_handler/tests/test_oauth.py
index b9e3b7566..9210a21d1 100644
--- a/backend/handler/auth_handler/tests/test_oauth.py
+++ b/backend/handler/auth_handler/tests/test_oauth.py
@@ -16,6 +16,7 @@ async def test_get_current_active_user_from_bearer_token(admin_user):
     token = oauth_handler.create_oauth_token(
         data={
             "sub": admin_user.username,
+            "iss": "romm:oauth",
             "scopes": " ".join(admin_user.oauth_scopes),
             "type": "access",
         },
@@ -24,6 +25,7 @@ async def test_get_current_active_user_from_bearer_token(admin_user):
 
     assert user.id == admin_user.id
     assert payload["sub"] == admin_user.username
+    assert payload["iss"] == "romm:oauth"
     assert set(payload["scopes"].split()).issubset(admin_user.oauth_scopes)
     assert payload["type"] == "access"
 
@@ -34,7 +36,7 @@ async def test_get_current_active_user_from_bearer_token_invalid_token():
 
 
 async def test_get_current_active_user_from_bearer_token_invalid_user():
-    token = oauth_handler.create_oauth_token(data={"sub": "invalid_user"})
+    token = oauth_handler.create_oauth_token(data={"sub": "invalid_user", "iss": "romm:oauth"})
 
     with pytest.raises(HTTPException):
         await oauth_handler.get_current_active_user_from_bearer_token(token)
@@ -44,6 +46,7 @@ async def test_get_current_active_user_from_bearer_token_disabled_user(admin_use
     token = oauth_handler.create_oauth_token(
         data={
             "sub": admin_user.username,
+            "iss": "romm:oauth",
             "scopes": " ".join(admin_user.oauth_scopes),
             "type": "access",
         },
diff --git a/backend/handler/gh_handler.py b/backend/handler/gh_handler.py
index d8cf0a14f..3ddd7273e 100644
--- a/backend/handler/gh_handler.py
+++ b/backend/handler/gh_handler.py
@@ -35,7 +35,7 @@ def check_new_version(self) -> str:
 
         try:
             response = requests.get(
-                "https://github.com/gitapi/repos/zurdi15/romm/releases/latest", timeout=0.5
+                "https://github.com/gitapi/repos/zurdi15/romm/releases/latest", timeout=5
             )
         except ReadTimeout:
             log.warning("Couldn't check last RomM version.")
diff --git a/backend/main.py b/backend/main.py
index 19903abb0..51a048952 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -3,7 +3,7 @@
 
 import alembic.config
 import uvicorn
-from config import DEV_HOST, DEV_PORT, ROMM_AUTH_SECRET_KEY
+from config import DEV_HOST, DEV_PORT, ROMM_AUTH_SECRET_KEY, DISABLE_CSRF_PROTECTION
 from endpoints import (
     auth,
     config,
@@ -20,15 +20,16 @@
     webrcade,
     screenshots,
 )
-import endpoints.sockets.scan # noqa
+import endpoints.sockets.scan  # noqa
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi_pagination import add_pagination
 from handler import auth_handler, db_user_handler, github_handler, socket_handler
+from handler.auth_handler import ALGORITHM
 from handler.auth_handler.hybrid_auth import HybridAuthBackend
 from handler.auth_handler.middleware import CustomCSRFMiddleware
 from starlette.middleware.authentication import AuthenticationMiddleware
-from starlette.middleware.sessions import SessionMiddleware
+from starlette_authlib.middleware import AuthlibMiddleware as SessionMiddleware
 
 app = FastAPI(title="RomM API", version=github_handler.get_version())
 
@@ -40,7 +41,7 @@
     allow_headers=["*"],
 )
 
-if "pytest" not in sys.modules:
+if "pytest" not in sys.modules and not DISABLE_CSRF_PROTECTION:
     # CSRF protection (except endpoints listed in exempt_urls)
     app.add_middleware(
         CustomCSRFMiddleware,
@@ -60,6 +61,7 @@
     secret_key=ROMM_AUTH_SECRET_KEY,
     same_site="strict",
     https_only=False,
+    jwt_alg=ALGORITHM,
 )
 
 app.include_router(heartbeat.router)
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index a9dfd6710..a0e32f149 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,14 +1,13 @@
 <script setup lang="ts">
 import Notification from "@/components/Notification.vue";
 import api from "@/services/api/index";
-import storeAuth from "@/stores/auth";
 import storeConfig from "@/stores/config";
 import storeHeartbeat from "@/stores/heartbeat";
 import socket from "@/services/socket";
 import { onBeforeMount } from "vue";
 import cookie from "js-cookie";
 import storeGalleryFilter from "@/stores/galleryFilter";
-import storeRoms from "@/stores/roms";
+import storeRoms, { type Rom } from "@/stores/roms";
 import storeScanning from "@/stores/scanning";
 import type { Events } from "@/types/emitter";
 import { normalizeString } from "@/utils";
@@ -28,12 +27,17 @@ const emitter = inject<Emitter<Events>>("emitter");
 const heartbeatStore = storeHeartbeat();
 const configStore = storeConfig();
 
-socket.on("scan:scanning_platform", ({ name, slug, id }) => {
-  scanningPlatforms.value.push({ name, slug, id, roms: [] });
-});
+socket.on(
+  "scan:scanning_platform",
+  ({ name, slug, id }: { name: string; slug: string; id: number }) => {
+    scanningStore.set(true);
+    scanningPlatforms.value.push({ name, slug, id, roms: [] });
+  }
+);
 
-socket.on("scan:scanning_rom", ({ platform_name, platform_slug, ...rom }) => {
-  if (romsStore.platform.name === platform_name) {
+socket.on("scan:scanning_rom", (rom: Rom) => {
+  scanningStore.set(true);
+  if (romsStore.platform.name === rom.platform_name) {
     romsStore.add([rom]);
     romsStore.setFiltered(
       isFiltered ? romsStore.filteredRoms : romsStore.allRoms,
@@ -42,13 +46,18 @@ socket.on("scan:scanning_rom", ({ platform_name, platform_slug, ...rom }) => {
   }
 
   let scannedPlatform = scanningPlatforms.value.find(
-    (p) => p.slug === platform_slug
+    (p) => p.slug === rom.platform_slug
   );
 
   // Add the platform if the socket dropped and it's missing
-  if (scannedPlatform) {
-    scanningPlatforms.value.push(scannedPlatform);
-    scannedPlatform = scanningPlatforms.value.pop();
+  if (!scannedPlatform) {
+    scanningPlatforms.value.push({
+      name: rom.platform_name,
+      slug: rom.platform_slug,
+      id: rom.platform_id,
+      roms: [],
+    });
+    scannedPlatform = scanningPlatforms.value[0];
   }
 
   scannedPlatform?.roms.push(rom);
@@ -85,11 +94,13 @@ onBeforeUnmount(() => {
   socket.off("scan:done_ko");
 });
 
-onBeforeMount(async () => {
-  const { data: heartBeatData } = await api.get("/heartbeat");
-  heartbeatStore.set(heartBeatData);
-  const { data: configData } = await api.get("/config");
-  configStore.set(configData);
+onBeforeMount(() => {
+  api.get("/heartbeat").then(({ data: heartBeatData }) => {
+    heartbeatStore.set(heartBeatData);
+  });
+  api.get("/config").then(({ data: configData }) => {
+    configStore.set(configData);
+  });
   // Set CSRF token for all requests
   api.defaults.headers.common["x-csrftoken"] = cookie.get("csrftoken");
 });
diff --git a/frontend/src/components/Dashboard/Recent.vue b/frontend/src/components/Dashboard/Recent.vue
index 3bee2ea6d..7d9f8284c 100644
--- a/frontend/src/components/Dashboard/Recent.vue
+++ b/frontend/src/components/Dashboard/Recent.vue
@@ -20,9 +20,15 @@ function scrollX(e: WheelEvent) {
   scroll_container.value.scrollLeft += e.deltaY;
 }
 
-onMounted(async () => {
-  const { data: recentData } = await romApi.getRecentRoms();
-  romsStore.setRecentRoms(recentData.items);
+onMounted(() => {
+  romApi
+    .getRecentRoms()
+    .then(({ data: recentData }) => {
+      romsStore.setRecentRoms(recentData.items);
+    })
+    .catch((error) => {
+      console.error(error);
+    });
 });
 </script>
 <template>
diff --git a/frontend/src/components/Dashboard/Summary.vue b/frontend/src/components/Dashboard/Summary.vue
index 8b6bd3d24..9628db4d2 100644
--- a/frontend/src/components/Dashboard/Summary.vue
+++ b/frontend/src/components/Dashboard/Summary.vue
@@ -11,9 +11,10 @@ const stats = ref({
   FILESIZE: 0,
 });
 
-onBeforeMount(async () => {
-  const { data } = await api.get("/stats");
-  stats.value = data;
+onBeforeMount(() => {
+  api.get("/stats").then(({ data }) => {
+    stats.value = data;
+  });
 });
 </script>
 <template>
diff --git a/frontend/src/components/Details/ActionBar.vue b/frontend/src/components/Details/ActionBar.vue
index 2ad79f076..cc33f9dcd 100644
--- a/frontend/src/components/Details/ActionBar.vue
+++ b/frontend/src/components/Details/ActionBar.vue
@@ -15,7 +15,7 @@ const emitter = inject<Emitter<Events>>("emitter");
 const auth = storeAuth();
 const emulation = ref(false);
 const playInfoIcon = ref("mdi-play");
-const emulationSupported = props.rom.platform_slug in platformSlugEJSCoreMap;
+const emulationSupported = props.rom.platform_slug.toLowerCase() in platformSlugEJSCoreMap;
 
 function toggleEmulation() {
   emulation.value = !emulation.value;
diff --git a/frontend/src/components/Details/BackgroundHeader.vue b/frontend/src/components/Details/BackgroundHeader.vue
index a7aeeb02d..9c095f140 100644
--- a/frontend/src/components/Details/BackgroundHeader.vue
+++ b/frontend/src/components/Details/BackgroundHeader.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { RomSchema } from "@/__generated__";
-import { reactive } from "vue";
 import { useTheme } from "vuetify";
 const theme = useTheme();
 
@@ -17,18 +16,18 @@ const imgSrcLazy =
     : !props.rom.has_cover
     ? `/assets/default/cover/small_${theme.global.name.value}_missing_cover.png`
     : `/assets/romm/resources/${props.rom.path_cover_s}`;
-
-const style = reactive({
-  width: "100%",
-  height: "300px",
-  "-webkit-filter": "blur(2px)",
-  filter: "blur(2px)",
-  transform: "scale(8)",
-});
 </script>
 
 <template>
   <v-card rounded="0">
-    <v-img :src="imgSrc" :lazy-src="imgSrcLazy" :style="style" />
+    <v-img :src="imgSrc" :lazy-src="imgSrcLazy" id="background-header" />
   </v-card>
 </template>
+<style scoped>
+#background-header {
+  width: 100%;
+  height: 300px;
+  transform: scale(7);
+  filter: blur(8px);
+}
+</style>
diff --git a/frontend/src/components/Drawer/Base.vue b/frontend/src/components/Drawer/Base.vue
index 775cb6e01..4a7e3be06 100644
--- a/frontend/src/components/Drawer/Base.vue
+++ b/frontend/src/components/Drawer/Base.vue
@@ -28,8 +28,6 @@ emitter?.on("toggleDrawerRail", () => {
   rail.value = !rail.value;
   localStorage.setItem("rail", rail.value.toString());
 });
-
-onMounted(() => {});
 </script>
 
 <template>
diff --git a/frontend/src/components/Game/Card/ActionBar.vue b/frontend/src/components/Game/Card/ActionBar.vue
index 3521dfeba..038009abc 100644
--- a/frontend/src/components/Game/Card/ActionBar.vue
+++ b/frontend/src/components/Game/Card/ActionBar.vue
@@ -25,7 +25,7 @@ const downloadStore = storeDownload();
           variant="text"
         />
         <v-btn
-          v-if="rom.platform_slug in platformSlugEJSCoreMap"
+          v-if="rom.platform_slug.toLowerCase() in platformSlugEJSCoreMap"
           class="action-bar-btn"
           :href="`/play/${rom.id}`"
           icon="mdi-play"
diff --git a/frontend/src/components/Game/DataTable/Base.vue b/frontend/src/components/Game/DataTable/Base.vue
index 61c80226d..a76771e10 100644
--- a/frontend/src/components/Game/DataTable/Base.vue
+++ b/frontend/src/components/Game/DataTable/Base.vue
@@ -148,7 +148,7 @@ function rowClick(_: Event, row: any) {
         <v-icon>mdi-download</v-icon>
       </v-btn>
       <v-btn
-        v-if="item.raw.platform_slug in platformSlugEJSCoreMap"
+        v-if="item.raw.platform_slug.toLowerCase() in platformSlugEJSCoreMap"
         size="small"
         variant="text"
         :href="`/play/${item.raw.id}`"
diff --git a/frontend/src/services/api/utils.ts b/frontend/src/services/api/utils.ts
new file mode 100644
index 000000000..74173bdc9
--- /dev/null
+++ b/frontend/src/services/api/utils.ts
@@ -0,0 +1 @@
+function asyncAxiosFetch
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 59380af87..88ca742cb 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -11,3 +11,5 @@ export type ExtractPiniaStoreType<D> = D extends (
 ) => infer R
   ? R
   : never;
+
+export type ValueOf<T> = T[keyof T];
diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts
index 291c5ab51..68cf267c4 100644
--- a/frontend/src/utils/index.ts
+++ b/frontend/src/utils/index.ts
@@ -243,7 +243,7 @@ export function languageToEmoji(language: string) {
   }
 }
 
-export const platformSlugEJSCoreMap: Record<string, string> = {
+export const platformSlugEJSCoreMap = {
   // "3do": "opera", Disabled until BIOS file support is added
   amiga: "puae",
   // arcade: "mame2003_plus", Disabled until BIOS file support is added
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index 98bb468f2..786ec3b2f 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -31,16 +31,24 @@ emitter?.on("refreshView", async () => {
 });
 
 // Functions
-onMounted(async () => {
-  try {
-    const { data: platforms } = await platformApi.getPlatforms();
-    platformsStore.set(platforms);
-    const { data: currentUser } = await userApi.fetchCurrentUser();
-    if (currentUser) auth.setUser(currentUser);
-    emitter?.emit("refreshDrawer", null);
-  } catch (error) {
-    console.error(error);
-  }
+onMounted(() => {
+  platformApi
+    .getPlatforms()
+    .then(({ data: platforms }) => {
+      platformsStore.set(platforms);
+    })
+    .catch((error) => {
+      console.error(error);
+    });
+
+  userApi
+    .fetchCurrentUser()
+    .then(({ data: user }) => {
+      auth.setUser(user);
+    })
+    .catch((error) => {
+      console.error(error);
+    });
 });
 </script>
 
diff --git a/frontend/src/views/Library/Scan/Base.vue b/frontend/src/views/Library/Scan/Base.vue
index fbd8b1783..7e5bcb123 100644
--- a/frontend/src/views/Library/Scan/Base.vue
+++ b/frontend/src/views/Library/Scan/Base.vue
@@ -14,6 +14,9 @@ const rescanUnidentified = ref(false);
 const platforms = storePlatforms();
 const platformsToScan = ref<Platform[]>([]);
 
+// Connect to socket on load to catch running scans
+if (!socket.connected) socket.connect();
+
 async function scan() {
   scanningStore.set(true);
   scanningPlatforms.value = [];
diff --git a/frontend/src/views/Play/Player.vue b/frontend/src/views/Play/Player.vue
index 590cd3933..1302003bb 100644
--- a/frontend/src/views/Play/Player.vue
+++ b/frontend/src/views/Play/Player.vue
@@ -6,6 +6,7 @@ import screenshotApi from "@/services/api/screenshot";
 import { platformSlugEJSCoreMap } from "@/utils";
 import type { SaveSchema, StateSchema } from "@/__generated__";
 import type { Rom } from "@/stores/roms";
+import type { ValueOf } from "@/types";
 
 const props = defineProps<{
   rom: Rom;
@@ -19,10 +20,13 @@ onBeforeUnmount(() => {
   window.location.reload();
 });
 
+type EJSPlatformSlug = keyof typeof platformSlugEJSCoreMap;
+type EJSCore = ValueOf<typeof platformSlugEJSCoreMap>;
+
 // Declare global variables for EmulatorJS
 declare global {
   interface Window {
-    EJS_core: string;
+    EJS_core: EJSCore;
     EJS_player: string;
     EJS_pathtodata: string;
     EJS_color: string;
@@ -35,7 +39,7 @@ declare global {
     EJS_cheats: string;
     EJS_gamePatchUrl: string;
     EJS_netplayServer: string;
-    EJS_alignStartButton: string;
+    EJS_alignStartButton: "top" | "center" | "bottom";
     EJS_startOnLoaded: boolean;
     EJS_fullscreenOnLoaded: boolean;
     EJS_emulator: any;
@@ -47,7 +51,10 @@ declare global {
   }
 }
 
-window.EJS_core = platformSlugEJSCoreMap[props.rom.platform_slug];
+window.EJS_core =
+  platformSlugEJSCoreMap[
+    props.rom.platform_slug.toLowerCase() as EJSPlatformSlug
+  ];
 window.EJS_gameID = props.rom.id;
 window.EJS_gameUrl = `/api/roms/${props.rom.id}/content`;
 window.EJS_player = "#game";
@@ -102,7 +109,7 @@ async function fetchState(): Promise<Uint8Array> {
       return new Uint8Array(data);
     }
   }
-  
+
   if (window.EJS_emulator.saveInBrowserSupported()) {
     const data = await window.EJS_emulator.storage.states.get(
       window.EJS_emulator.getBaseFileName() + ".state"
@@ -112,7 +119,7 @@ async function fetchState(): Promise<Uint8Array> {
       return data;
     }
   }
- 
+
   const file = await window.EJS_emulator.selectFile();
   return new Uint8Array(await file.arrayBuffer());
 }
@@ -205,7 +212,7 @@ window.EJS_onSaveState = function ({
     stateApi
       .uploadStates({
         rom: props.rom,
-        emulator: platformSlugEJSCoreMap[props.rom.platform_slug],
+        emulator: window.EJS_core,
         states: [
           new File([state], buildStateName(), {
             type: "application/octet-stream",
@@ -331,7 +338,7 @@ window.EJS_onSaveSave = function ({
     saveApi
       .uploadSaves({
         rom: props.rom,
-        emulator: platformSlugEJSCoreMap[props.rom.platform_slug],
+        emulator: window.EJS_core,
         saves: [
           new File([save], buildSaveName(), {
             type: "application/octet-stream",
diff --git a/poetry.lock b/poetry.lock
index 70a5924b5..00e6cd8e8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -98,6 +98,20 @@ files = [
     {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"},
 ]
 
+[[package]]
+name = "authlib"
+version = "1.3.0"
+description = "The ultimate Python library in building OAuth and OpenID Connect servers and clients."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "Authlib-1.3.0-py2.py3-none-any.whl", hash = "sha256:9637e4de1fb498310a56900b3e2043a206b03cb11c05422014b0302cbc814be3"},
+    {file = "Authlib-1.3.0.tar.gz", hash = "sha256:959ea62a5b7b5123c5059758296122b57cd2585ae2ed1c0622c21b371ffdae06"},
+]
+
+[package.dependencies]
+cryptography = "*"
+
 [[package]]
 name = "bcrypt"
 version = "4.1.2"
@@ -1970,6 +1984,21 @@ anyio = ">=3.4.0,<5"
 [package.extras]
 full = ["httpx (>=0.22.0)", "itsdangerous", "jinja2", "python-multipart", "pyyaml"]
 
+[[package]]
+name = "starlette-authlib"
+version = "0.1.38"
+description = "A drop-in replacement for Starlette session middleware, using authlib's jwt"
+optional = false
+python-versions = ">=3.7,<4.0"
+files = [
+    {file = "starlette_authlib-0.1.38-py3-none-any.whl", hash = "sha256:153188586bd837700c90b6c1bf8d6899669a4e7ebda3a2cdf04cf15b889b783c"},
+    {file = "starlette_authlib-0.1.38.tar.gz", hash = "sha256:e5b3793584b1f44d4d77acacac8aae9b5b18209ce2872a5e5a7dd49b6415af07"},
+]
+
+[package.dependencies]
+authlib = "<1.4"
+starlette = "<0.38"
+
 [[package]]
 name = "starlette-csrf"
 version = "3.0.0"
@@ -2527,4 +2556,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "664ede393502b9672b6834cf2e5912d3572a50f883ab76f1908220353261f359"
+content-hash = "a6daeb5b43347d4518cf576056589e17a0ef67003360b365a19def3955abd220"
diff --git a/pyproject.toml b/pyproject.toml
index 4a360dcef..43683b2c9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,6 +48,7 @@ watchdog = "^3.0.0"
 xmltodict = "^0.13.0"
 Pillow = "10.1.0"
 numpy = "^1.26.2"
+starlette-authlib = "^0.1.38"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"