diff --git a/src/ui/Desktop/Homepage/Homepage.tsx b/src/ui/Desktop/Homepage/Homepage.tsx
index 2cc25b41..7ffd096b 100644
--- a/src/ui/Desktop/Homepage/Homepage.tsx
+++ b/src/ui/Desktop/Homepage/Homepage.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { HomepageAuth } from "@/ui/Desktop/Homepage/HomepageAuth.tsx";
 import { HomepageUpdateLog } from "@/ui/Desktop/Homepage/HompageUpdateLog.tsx";
+import { HomepageAlertManager } from "@/ui/Desktop/Homepage/HomepageAlertManager.tsx";
 import { Button } from "@/components/ui/button.tsx";
 import { getUserInfo, getDatabaseHealth, getCookie } from "@/ui/main-axios.ts";
 import { useTranslation } from "react-i18next";
@@ -45,10 +46,11 @@ export function Homepage({
           .then(([meRes]) => {
             setIsAdmin(!!meRes.is_admin);
             setUsername(meRes.username || null);
-            setUserId(meRes.id || null);
+            setUserId(meRes.userId || null);
             setDbError(null);
           })
           .catch((err) => {
+            console.error("Homepage: Error fetching user info:", err);
             setIsAdmin(false);
             setUsername(null);
             setUserId(null);
@@ -150,6 +152,8 @@ export function Homepage({
           </div>
         </div>
       )}
+      
+      <HomepageAlertManager userId={userId} loggedIn={loggedIn} />
     </>
   );
 }
diff --git a/src/ui/Desktop/Homepage/HomepageAlertManager.tsx b/src/ui/Desktop/Homepage/HomepageAlertManager.tsx
index b3f83854..bb704c66 100644
--- a/src/ui/Desktop/Homepage/HomepageAlertManager.tsx
+++ b/src/ui/Desktop/Homepage/HomepageAlertManager.tsx
@@ -34,7 +34,6 @@ export function HomepageAlertManager({
 
     try {
       const response = await getUserAlerts(userId);
-
       const userAlerts = response.alerts || [];
 
       const sortedAlerts = userAlerts.sort((a: TermixAlert, b: TermixAlert) => {
diff --git a/src/ui/main-axios.ts b/src/ui/main-axios.ts
index f30fa91e..2f149a3c 100644
--- a/src/ui/main-axios.ts
+++ b/src/ui/main-axios.ts
@@ -66,7 +66,7 @@ interface AuthResponse {
 
 interface UserInfo {
   totp_enabled: boolean;
-  id: string;
+  userId: string;
   username: string;
   is_admin: boolean;
   is_oidc: boolean;