diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
index 727f6c9e78..69be8514e0 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
@@ -230,6 +230,16 @@ public class ConfigController {
             }
             configData.put("isNewUser", isNewUser);
 
+            String username = null;
+            if (userService != null) {
+                try {
+                    username = userService.getCurrentUsername();
+                } catch (Exception e) {
+                    // Not authenticated or security disabled
+                }
+            }
+            configData.put("username", username);
+
             // System settings
             configData.put(
                     "enableAlphaFunctionality",
diff --git a/frontend/src/core/components/viewer/LocalEmbedPDF.tsx b/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
index c542b68ba7..d58e164152 100644
--- a/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
+++ b/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
@@ -63,7 +63,7 @@ import { absoluteWithBasePath } from '@app/constants/app';
 import { FormFieldOverlay } from '@app/tools/formFill/FormFieldOverlay';
 import { CommentsSidebar } from '@app/components/viewer/CommentsSidebar';
 import { CommentAuthorProvider } from '@app/contexts/CommentAuthorContext';
-import { accountService } from '@app/services/accountService';
+import { useAppConfig } from '@app/contexts/AppConfigContext';
 
 interface LocalEmbedPDFProps {
   file?: File | Blob;
@@ -90,15 +90,10 @@ interface LocalEmbedPDFProps {
 
 export function LocalEmbedPDF({ file, url, fileName, enableAnnotations = false, enableRedaction = false, enableFormFill = false, isManualRedactionMode = false, showBakedAnnotations = true, onSignatureAdded, signatureApiRef, annotationApiRef, historyApiRef, redactionTrackerRef, fileId, isCommentsSidebarVisible = false, commentsSidebarRightOffset = '0rem', isSignMode = false }: LocalEmbedPDFProps) {
   const { t } = useTranslation();
+  const { config } = useAppConfig();
   const [pdfUrl, setPdfUrl] = useState<string | null>(null);
   const [, setAnnotations] = useState<Array<{id: string, pageIndex: number, rect: Rect}>>([]);
-  const [commentAuthorName, setCommentAuthorName] = useState<string>('Guest');
-
-  useEffect(() => {
-    accountService.getAccountData().then((data) => {
-      if (data?.username) setCommentAuthorName(data.username);
-    }).catch(() => {/* not logged in or security disabled */});
-  }, []);
+  const commentAuthorName = config?.username ?? 'Guest';
 
   // Convert File to URL if needed
   useEffect(() => {
diff --git a/frontend/src/core/types/appConfig.ts b/frontend/src/core/types/appConfig.ts
index 0b86070680..05212dd5d1 100644
--- a/frontend/src/core/types/appConfig.ts
+++ b/frontend/src/core/types/appConfig.ts
@@ -42,6 +42,7 @@ export interface AppConfig {
   error?: string;
   isNewServer?: boolean;
   isNewUser?: boolean;
+  username?: string | null;
   defaultHideUnavailableTools?: boolean;
   defaultHideUnavailableConversions?: boolean;
   hideDisabledToolsGoogleDrive?: boolean;