diff --git a/app/page.tsx b/app/page.tsx
index c9b450f1..c8a3be41 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -15,7 +15,7 @@ import ScrollToTop from '@/components/page/home/featured/scroll-to-top';
 import { getFeaturedData } from '@/services/featured.service';
 
 export default async function Home() {
-  const { featuredData, discoverData, isLoggedIn, isError, userInfo, authToken, focusAreas } = await getPageData();
+  const { featuredData, discoverData, isLoggedIn, isError, userInfo, focusAreas } = await getPageData();
 
   if (isError) {
     return <Error />;
@@ -39,8 +39,8 @@ export default async function Home() {
         <ScrollToTop pageName='Home' userInfo={userInfo}/>
       </div>
     </div>
-    <HuskyDialog isLoggedIn={isLoggedIn} authToken={authToken}/>
-    <HuskyDiscover isLoggedIn={isLoggedIn} authToken={authToken}/>
+    <HuskyDialog isLoggedIn={isLoggedIn} />
+    <HuskyDiscover isLoggedIn={isLoggedIn} />
     </>
 }
 
@@ -80,7 +80,6 @@ const getPageData = async () => {
         isError,
         userInfo,
         isLoggedIn,
-        authToken,
         focusAreas: {
             teamFocusAreas ,
             projectFocusAreas
diff --git a/components/core/husky/husky-ai.tsx b/components/core/husky/husky-ai.tsx
index f5fcf5d2..da008f6a 100644
--- a/components/core/husky/husky-ai.tsx
+++ b/components/core/husky/husky-ai.tsx
@@ -26,7 +26,6 @@ interface HuskyAiProps {
   isLoggedIn: boolean;
   blogId?: string;
   onClose?: () => void;
-  authToken: string;
 }
 
 interface Chat {
@@ -42,7 +41,7 @@ const DEFAULT_TAB_ITEMS = [
 
 // This component represents the Husky AI interface, allowing users to interact with the AI in chat or blog modes.
 
-function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose, authToken }: HuskyAiProps) {
+function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose }: HuskyAiProps) {
   const [activeTab, setActiveTab] = useState<string>(DEFAULT_TAB_ITEMS[0].key);
   const [chats, setChats] = useState<Chat[]>(initialChats);
   const [isLoading, setLoadingStatus] = useState<boolean>(false);
@@ -56,6 +55,7 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
   const chatCnRef = useRef<HTMLDivElement>(null);
   const router = useRouter();
   const { trackTabSelection, trackUserPrompt, trackAnswerCopy, trackFollowupQuestionClick, trackQuestionEdit, trackRegenerate, trackCopyUrl, trackFeedbackClick, trackAiResponse } = useHuskyAnalytics();
+  const [authToken, setAuthToken] = useState(null);
 
   // Handles the selection of a tab in the UI
   const onTabSelected = (item: string) => {
@@ -81,6 +81,24 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
     trackAnswerCopy(answer);
   };
 
+  // update auth token
+  const updateToken = async () => {
+    try {
+      if (!isLoggedIn) {
+        setAuthToken(null);
+        return;
+      }
+      const { isLoginRequired, newAuthToken } = await getUserCredentialsInfo();
+      if (isLoginRequired) {
+        setAuthToken(null);
+        return;
+      }
+      setAuthToken(newAuthToken); // Update token state
+    } catch (error) {
+      console.error('Failed to update token:', error);
+    }
+  };
+
   // Fetches user credentials and handles login state
   const getUserCredentials = async () => {
     if (!isLoggedIn) {
@@ -133,7 +151,6 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
         .optional(),
     }),
     onFinish: (data) => {
-      console.log(data);
     },
     onError: (error) => {
       console.error(error);
@@ -151,6 +168,10 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
     return chatUid;
   };
 
+  const onInitialPromptClicked = (quesObj: any) => {
+    setChats([{ ...quesObj, isError: false }]);
+  }
+
   // Handles the event when a prompt is clicked
   const onPromptClicked = async (question: string) => {
     try {
@@ -158,13 +179,14 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
       if (!authToken) {
         return;
       }
+      await updateToken();
       const chatUid = checkAndSetPromptId();
       setAskingQuestion(question);
       setAnswerLoadingStatus(true);
       setActiveTab(DEFAULT_TAB_ITEMS[0].key);
       setChats((prev:any) => [...prev, {
         question,
-        content: "",
+        answer: "",
         followupQuestions: [],
         sources: [],
         actions: [],
@@ -222,10 +244,10 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
         setLoginBoxStatus(true);
         return;
       }
-
+      await updateToken();
       setChats((prev:any) => [...prev, {
         question,
-        content: "",
+        answer: "",
         followupQuestions: [],
         sources: [],
         actions: [],
@@ -302,13 +324,14 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
         setLoginBoxStatus(true);
         return;
       }
+      await updateToken();
       if (activeTab === 'supported-scope') { 
         setChats([]);
         setActiveTab(DEFAULT_TAB_ITEMS[0].key);
       }
       setChats((prev:any) => [...prev, {
         question:query,
-        content: "",
+        answer: "",
         followupQuestions: [],
         sources: [],
         actions: [],
@@ -341,6 +364,21 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
   };
 
   useEffect(() => {
+    if(error) {
+      setChats((prev:any) => {
+      const newMessages = [...prev];
+      
+      // Update the last item in the array
+      const lastIndex = newMessages.length - 1;
+      newMessages[lastIndex] = {
+        ...newMessages[lastIndex],
+        answer:  "",
+        isError: true
+      };
+      return newMessages;
+    })
+    }
+
     if (object?.content && isLoadingObject) {
       setAnswerLoadingStatus(false);
       setChats((prev:any) => {
@@ -373,7 +411,7 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
       });
       
     }
-  }, [object, isLoadingObject]);
+  }, [object, isLoadingObject, error]);
 
   // Handles the login click event
   const onLoginClick = () => {
@@ -395,6 +433,11 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
     }
   }, [isAnswerLoading]);
 
+  useEffect(() => {
+    updateToken(); // Fetch token on initial render
+  }, []);
+
+
   return (
     <>
       {mode === 'chat' && (
@@ -411,12 +454,14 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
               onRegenerate={onRegenerate}
               onQuestionEdit={onQuestionEdit}
               onPromptClicked={onPromptClicked}
+              onInitialPromptClicked={onInitialPromptClicked}
               isAnswerLoading={isAnswerLoading}
               chats={chats}
               blogId={blogId}
               onFollowupClicked={onFollowupClicked}
               mode="chat"
               onCopyAnswer={onCopyAnswer}
+              isLoadingObject={isLoadingObject}
             />
              {isAnswerLoading && <HuskyAnswerLoader question={askingQuestion} data-testid="chat-answer-loader" />}
           </div>
@@ -434,6 +479,7 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
               onRegenerate={onHuskyInput}
               onQuestionEdit={onQuestionEdit}
               onPromptClicked={onPromptClicked}
+              onInitialPromptClicked={onInitialPromptClicked}
               onShareClicked={onShareClicked}
               isAnswerLoading={isAnswerLoading}
               chats={chats}
@@ -441,6 +487,7 @@ function HuskyAi({ mode = 'chat', initialChats = [], isLoggedIn, blogId, onClose
               onFollowupClicked={onFollowupClicked}
               mode="blog"
               onCopyAnswer={onCopyAnswer}
+              isLoadingObject={isLoadingObject}
             />
             {isAnswerLoading && <HuskyAnswerLoader question={askingQuestion} data-testid="blog-answer-loader" />}
           </div>
diff --git a/components/core/husky/husky-chat-suggestion.tsx b/components/core/husky/husky-chat-suggestion.tsx
index 81d7b1c2..c0cfb5d8 100644
--- a/components/core/husky/husky-chat-suggestion.tsx
+++ b/components/core/husky/husky-chat-suggestion.tsx
@@ -6,13 +6,14 @@ interface HuskyChatSuggestionsProps {
   onFollowupClicked?: (question: string) => Promise<void>;
   chatIndex?: number;
   isAnswerLoading: boolean;
+  isLoadingObject: boolean;
 }
 
-function HuskyChatSuggestions({ followupQuestions = [], chatIndex = 0, onFollowupClicked, isAnswerLoading }: HuskyChatSuggestionsProps) {
+function HuskyChatSuggestions({ followupQuestions = [], chatIndex = 0, onFollowupClicked, isAnswerLoading, isLoadingObject }: HuskyChatSuggestionsProps) {
   // Handles the click event for a follow-up question.
   // If an answer is loading, it prevents further actions.
   const onQuestionClicked = (question: string) => {
-    if(isAnswerLoading) {
+    if(isAnswerLoading || isLoadingObject) {
       return;
     }
     if (onFollowupClicked) {
diff --git a/components/core/husky/husky-chat.tsx b/components/core/husky/husky-chat.tsx
index 52a525d3..c898cf80 100644
--- a/components/core/husky/husky-chat.tsx
+++ b/components/core/husky/husky-chat.tsx
@@ -18,8 +18,10 @@ interface HuskyChatProps {
   onCopyAnswer: (answer: string) => Promise<void>;
   blogId?: string;
   isAnswerLoading: boolean;
+  isLoadingObject: boolean;
+  onInitialPromptClicked: (quesObj: any) => void;
 }
-function HuskyChat({ mode, chats, onFollowupClicked, isAnswerLoading, onQuestionEdit, onShareClicked, onPromptClicked, onCopyAnswer, onRegenerate, onFeedback, blogId }: HuskyChatProps) {  
+function HuskyChat({ mode, chats, onInitialPromptClicked, onFollowupClicked, isAnswerLoading, onQuestionEdit, onShareClicked, onPromptClicked, onCopyAnswer, onRegenerate, onFeedback, blogId, isLoadingObject }: HuskyChatProps) {  
   return (
     <>
       <div className="huskychat">
@@ -46,7 +48,7 @@ function HuskyChat({ mode, chats, onFollowupClicked, isAnswerLoading, onQuestion
                     mode={mode}
                     answer={chat?.answer}
                   />}
-                  {chat?.followupQuestions?.length > 0 && <HuskyChatSuggestions isAnswerLoading={isAnswerLoading} chatIndex={index} onFollowupClicked={onFollowupClicked} followupQuestions={chat?.followupQuestions} />}
+                  {chat?.followupQuestions?.length > 0 && <HuskyChatSuggestions isLoadingObject={isLoadingObject} isAnswerLoading={isAnswerLoading} chatIndex={index} onFollowupClicked={onFollowupClicked} followupQuestions={chat?.followupQuestions} />}
                   {mode !== 'blog' && chat?.actions?.length > 0 && <HuskyChatActions actions={chat?.actions} />}
                 </>
               )}
@@ -69,7 +71,7 @@ function HuskyChat({ mode, chats, onFollowupClicked, isAnswerLoading, onQuestion
             </div>
           ))}
         </div>}
-        {chats.length === 0 && !isAnswerLoading && <HuskyEmptyChat onPromptClicked={onPromptClicked} />}
+        {chats.length === 0 && !isAnswerLoading && <HuskyEmptyChat onInitialPromptClicked={onInitialPromptClicked} onPromptClicked={onPromptClicked} />}
       </div>
       <style jsx>
         {`
diff --git a/components/core/husky/husky-empty-chat.tsx b/components/core/husky/husky-empty-chat.tsx
index cdb0d970..e9f1e565 100644
--- a/components/core/husky/husky-empty-chat.tsx
+++ b/components/core/husky/husky-empty-chat.tsx
@@ -2,19 +2,18 @@
 // allowing users to submit prompts and view suggestions.
 
 import { useHuskyAnalytics } from '@/analytics/husky.analytics';
-import { useState, useRef } from 'react';
+import { getChatQuestions } from '@/services/discovery.service';
+import { useState, useRef, useEffect } from 'react';
 
 interface HuskyEmptyChatProps {
   onPromptClicked: (ques: string) => Promise<void>;
+  onInitialPromptClicked: (quesObj: any) => void;
 }
 
-function HuskyEmptyChat({ onPromptClicked }: HuskyEmptyChatProps) {
+function HuskyEmptyChat({ onPromptClicked, onInitialPromptClicked }: HuskyEmptyChatProps) {
   // Initial prompts displayed to the user
-  const initialPrompts = [
-    { text: 'Summary of discussions from the LabWeek Field Building sessions?', icon: '/icons/send-black.svg' },
-    { text: 'Recent updates from the Filecoin ecosystem?', icon: '/icons/send-black.svg' },
-    { text: 'What initiatives or programs does Protocol Labs offer to foster innovation in decentralized technologies?', icon: '/icons/send-black.svg' },
-  ];
+
+  const [initialPrompts, setInitialPrompts] = useState<any[]>([]);
 
   // Function to check if the user is on a mobile device
   const isMobileDevice = () => {
@@ -39,9 +38,9 @@ function HuskyEmptyChat({ onPromptClicked }: HuskyEmptyChatProps) {
   };
 
   // Handles the click event for exploration prompts
-  const onExplorationPromptClicked = async (ques: string) => {
-    trackExplorationPromptSelection(ques);
-    await onPromptClicked(ques);
+  const onExplorationPromptClicked = async (quesObj: any) => {
+    trackExplorationPromptSelection(quesObj.question);
+    onInitialPromptClicked(quesObj);
   };
 
   // Handles key down events in the textarea
@@ -55,6 +54,13 @@ function HuskyEmptyChat({ onPromptClicked }: HuskyEmptyChatProps) {
     }
   };
 
+
+  useEffect(() => {
+    getChatQuestions().then((res) => {
+      setInitialPrompts(res.data);
+    });
+  }, []);
+
   return (
     <>
       <div className="hec" data-testid="husky-empty-chat">
@@ -101,10 +107,10 @@ function HuskyEmptyChat({ onPromptClicked }: HuskyEmptyChatProps) {
                 <span className="hec__content__box__prompts__title__text">Try asking or searching for</span>
               </h4>
               <div className="hec__content__box__prompts__list">
-                {initialPrompts.map((prompt, index) => (
-                  <div className="hec__content__box__prompts__list__item" key={index} onClick={() => onExplorationPromptClicked(prompt.text)} data-testid={`prompt-${index}`}> {/* Added data-testid for each prompt */}
+                {initialPrompts?.slice(0, 5)?.map((prompt, index) => (
+                  <div className="hec__content__box__prompts__list__item" key={index} onClick={() => onExplorationPromptClicked(prompt)} data-testid={`prompt-${index}`}> {/* Added data-testid for each prompt */}
                     <img alt="Prompt Icon" src={prompt.icon} className="hec__content__box__prompts__list__item__icon" />
-                    <span className="hec__content__box__prompts__list__item__text">{prompt.text}</span>
+                    <span className="hec__content__box__prompts__list__item__text">{prompt.question}</span>
                   </div>
                 ))}
               </div>
diff --git a/components/core/husky/husky-input-box.tsx b/components/core/husky/husky-input-box.tsx
index 2a9c3f08..62780a56 100644
--- a/components/core/husky/husky-input-box.tsx
+++ b/components/core/husky/husky-input-box.tsx
@@ -81,6 +81,20 @@ function HuskyInputBox(props: any) {
     };
   }, [isAnswerLoading]);
 
+  useEffect(() => {
+    const handler = (e: any) => {
+      const question = e.detail;
+      if (inputRef.current) {
+        inputRef.current.innerText = question;
+      }
+    };
+    
+    document.addEventListener('husky-ai-input', handler);
+    return () => {
+      document.removeEventListener('husky-ai-input', handler);
+    };
+  }, []);
+
   return (
     <>
       <div className={`huskyinput`} data-testid="husky-input-box">
@@ -189,7 +203,7 @@ function HuskyInputBox(props: any) {
           }
 
           .huskyinput__itemcn__instruction__tag {
-            border: 1px solid #CBD5E1;
+            border: 1px solid #cbd5e1;
             padding: 2px 4px;
             border-radius: 4px;
           }
diff --git a/components/core/husky/husky-login.tsx b/components/core/husky/husky-login.tsx
index 06e06933..e92dcdac 100644
--- a/components/core/husky/husky-login.tsx
+++ b/components/core/husky/husky-login.tsx
@@ -64,7 +64,7 @@ function HuskyLogin({ onLoginBoxClose, onLoginClick }: HuskyLoginProps) {
             display: flex;
             align-items: center;
             justify-content: center;
-            z-index: 2;
+            z-index: 3;
           }
           .login-popup__box {
             background: white;
diff --git a/components/page/home/husky-dialog.tsx b/components/page/home/husky-dialog.tsx
index c7868741..dfda2cf0 100644
--- a/components/page/home/husky-dialog.tsx
+++ b/components/page/home/husky-dialog.tsx
@@ -6,7 +6,6 @@ import { useEffect, useRef, useState } from 'react';
 function HuskyDialog(props:any) {
   const dialogRef = useRef<HTMLDialogElement>(null);
   const isLoggedIn = props?.isLoggedIn;
-  const authToken = props?.authToken;
   const [isOpen, setIsOpen] = useState(false);
 
   const onDialogClose = () => {
@@ -35,7 +34,7 @@ function HuskyDialog(props:any) {
           <img onClick={onDialogClose} className="hd__head__close" src="/icons/close.svg" />
         </div>
         <div className="hd__content">
-          {isOpen && <HuskyAi onClose={onDialogClose} isLoggedIn={isLoggedIn} authToken={authToken} />}
+          {isOpen && <HuskyAi onClose={onDialogClose} isLoggedIn={isLoggedIn} />}
         </div>
       </dialog>
       <style jsx>
diff --git a/components/page/home/husky-discover.tsx b/components/page/home/husky-discover.tsx
index 10997460..751f9fc5 100644
--- a/components/page/home/husky-discover.tsx
+++ b/components/page/home/husky-discover.tsx
@@ -23,7 +23,6 @@ function HuskyDiscover(props: any) {
   const [initialChats, setInitialChats] = useState<any[]>([])
   const [isLoading, setLoadingStatus] = useState(false);
   const { trackSharedBlog} = useHuskyAnalytics();
-  const authToken = props?.authToken;
 
   const onDialogClose = () => {
     dialogRef.current?.close();
@@ -105,7 +104,7 @@ function HuskyDiscover(props: any) {
           <img onClick={onDialogClose} className="hd__head__close" src="/icons/close.svg" />
         </div>
         <div className="hd__content">
-          {initialChats.length > 0 && <HuskyAi blogId={slugId} isLoggedIn={isLoggedIn} authToken={authToken} initialChats={initialChats} mode="blog" onClose={onDialogClose} />}
+          {initialChats.length > 0 && <HuskyAi blogId={slugId} isLoggedIn={isLoggedIn} initialChats={initialChats} mode="blog" onClose={onDialogClose} />}
         </div>
       </dialog>
       {isLoading && <PageLoader/>}
diff --git a/services/discovery.service.ts b/services/discovery.service.ts
index 681b2b0d..c0d43550 100644
--- a/services/discovery.service.ts
+++ b/services/discovery.service.ts
@@ -149,4 +149,33 @@ export const getProjectsPrompts = async () => {
       relatedQuestions: o.relatedQuestions.map((v: any) => v.content),
     };
   });
+};
+
+export const getChatQuestions = async () => {
+  const url = `${process.env.DIRECTORY_API_URL}/v1/home/discovery/questions/?type=CHAT`;
+
+  const response = await fetch(url, {
+    method: 'GET',
+    cache: 'no-store',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+
+  const result = await response.json();
+  const formattedResult = result?.map((res: any) => {
+    return {
+      uid: res.uid,
+      question: res.content,
+      answer: res.answer,
+      answerSourceLinks: res.answerSources,
+      followupQuestions: res.relatedQuestions.map((v: any) => v.content),
+      icon: '/icons/send-black.svg'
+    };
+  });
+
+  if (!response?.ok) {
+    return { error: { statusText: response?.statusText, status: response?.status } };
+  }
+  return { data: formattedResult };
 };
\ No newline at end of file