diff --git a/src/ProtectedRoute.tsx b/src/ProtectedRoute.tsx
index 6e99adaa..19b79571 100644
--- a/src/ProtectedRoute.tsx
+++ b/src/ProtectedRoute.tsx
@@ -1,21 +1,23 @@
 import React, { useContext } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import Notify from './components/Notify';
 import { UserContext } from './hook/useAuth';
 import checkOrgTokenExpiration from './utils/validateOrgToken';
-import { useSearchParams } from 'react-router-dom';
+
 interface SomeType {
   children: any;
 }
 // eslint-disable-next-line react/prop-types
 export default function ProtectedRoutes(obj: SomeType) {
-
-  const[searchParams]=useSearchParams()
+  const [searchParams] = useSearchParams();
   const { user } = useContext(UserContext);
   /* istanbul ignore next */
   checkOrgTokenExpiration();
 
   if (!user?.auth) {
-    if(searchParams){sessionStorage.setItem("redirectParams",searchParams.toString())}
+    if (searchParams) {
+      sessionStorage.setItem('redirectParams', searchParams.toString());
+    }
     return obj.children;
   }
   /* istanbul ignore next */
diff --git a/src/components/CommunityQuestions.tsx b/src/components/CommunityQuestions.tsx
index d555d88c..9f623f70 100644
--- a/src/components/CommunityQuestions.tsx
+++ b/src/components/CommunityQuestions.tsx
@@ -196,13 +196,13 @@ function CommunityQuestions() {
               value={questionTitleText}
               onChange={(e) => setQuestionTitleText(e.target.value)}
               placeholder="Write question title..."
-              className="p-2 border dark:bg-dark-tertiary  border-gray-300 dark:border-gray-600 dark:text-black rounded w-full"
+              className="p-2 border dark:bg-dark-tertiary  dark:text-white border-gray-300 dark:border-gray-600 rounded w-full"
             />
             <textarea
               value={questionText}
               onChange={(e) => setQuestionText(e.target.value)}
               rows={3}
-              className="w-full dark:bg-dark-tertiary  p-2 border rounded-md dark:text-black"
+              className="w-full dark:bg-dark-tertiary dark:text-white p-2 border rounded-md "
               placeholder="Ask a question..."
             />
             <button
@@ -234,7 +234,7 @@ function CommunityQuestions() {
             >
               <p className="text-md font-semibold">{question?.title}</p>
               <p className="text-sm text-secondary dark:text-dark-text-fill">
-                Asked by: {question?.author?.email}
+                Asked by: {question?.author?.profile?.name}
               </p>
             </li>
           ))}
@@ -249,7 +249,7 @@ function CommunityQuestions() {
             </h2>
             <span>{selectedQuestion?.content}</span>
             <p className="text-sm text-secondary dark:text-dark-text-fill">
-              Asked by {selectedQuestion?.author?.email}
+              Asked by {selectedQuestion?.author?.profile?.name}
             </p>
             {loggedUser && loggedUser === selectedQuestion?.author?.id && (
               <button
@@ -285,7 +285,7 @@ function CommunityQuestions() {
                     >
                       <p>{answer.content}</p>
                       <p className="text-sm text-secondary  dark:text-white">
-                        Answered by {answer.author.email}
+                        Answered by {answer.author?.profile?.name}
                       </p>
                     </div>
 
@@ -307,7 +307,6 @@ function CommunityQuestions() {
                 </p>
               )}
 
-              {/* Answer submission form for the logged-in user */}
               {loggedUser && (
                 <div className="mt-4 flex items-start flex-col w-full">
                   <textarea
diff --git a/src/queries/questions.query.tsx b/src/queries/questions.query.tsx
index b741f903..d5dc96bb 100644
--- a/src/queries/questions.query.tsx
+++ b/src/queries/questions.query.tsx
@@ -12,6 +12,9 @@ export const GET_ALL_QUESTIONS = gql`
         profile {
           avatar
           bio
+          lastName
+          firstName
+          name
         }
       }
       createdAt
@@ -21,6 +24,11 @@ export const GET_ALL_QUESTIONS = gql`
         author {
           id
           email
+          profile {
+            lastName
+            firstName
+            name
+          }
         }
         createdAt
       }