diff --git a/src/commons/application/actions/__tests__/SessionActions.ts b/src/commons/application/actions/__tests__/SessionActions.ts
index a2def9171e..a26136d2df 100644
--- a/src/commons/application/actions/__tests__/SessionActions.ts
+++ b/src/commons/application/actions/__tests__/SessionActions.ts
@@ -253,6 +253,7 @@ test('setCourseConfiguration generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultLlmPrompt: 'defaul Llm Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = setCourseConfiguration(courseConfig);
@@ -656,6 +657,7 @@ test('updateCourseConfig generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultLlmPrompt: 'default LLM Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = updateCourseConfig(courseConfig);
diff --git a/src/commons/application/reducers/__tests__/SessionReducer.ts b/src/commons/application/reducers/__tests__/SessionReducer.ts
index bdd39ae661..efffe3a579 100644
--- a/src/commons/application/reducers/__tests__/SessionReducer.ts
+++ b/src/commons/application/reducers/__tests__/SessionReducer.ts
@@ -100,6 +100,7 @@ test('SET_COURSE_CONFIGURATION works correctly', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultLlmPrompt: 'default LLM Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = {
diff --git a/src/commons/application/types/SessionTypes.ts b/src/commons/application/types/SessionTypes.ts
index ac5640e725..72062d029f 100644
--- a/src/commons/application/types/SessionTypes.ts
+++ b/src/commons/application/types/SessionTypes.ts
@@ -99,6 +99,7 @@ export type SessionState = {
   readonly sourceChapter?: Chapter;
   readonly sourceVariant?: Variant;
   readonly moduleHelpText?: string;
+  readonly defaultLlmPrompt?: string;
   readonly assetsPrefix?: string;
 
   readonly assessmentConfigurations?: AssessmentConfiguration[];
@@ -164,6 +165,7 @@ export type CourseConfiguration = {
   sourceChapter: Chapter;
   sourceVariant: Variant;
   moduleHelpText: string;
+  defaultLlmPrompt: string;
   assetsPrefix: string;
 };
 
diff --git a/src/commons/dropdown/DropdownCreateCourse.tsx b/src/commons/dropdown/DropdownCreateCourse.tsx
index 41c6fc09a6..3f9ab95636 100644
--- a/src/commons/dropdown/DropdownCreateCourse.tsx
+++ b/src/commons/dropdown/DropdownCreateCourse.tsx
@@ -42,7 +42,8 @@ const DropdownCreateCourse: React.FC<Props> = props => {
     enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: ''
+    moduleHelpText: '',
+    defaultLlmPrompt: ''
   });
 
   const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
@@ -173,6 +174,40 @@ const DropdownCreateCourse: React.FC<Props> = props => {
           )}
         </FormGroup>
 
+        <FormGroup helperText="defaultLlmPrompt" labelFor="defaultLlmPrompt">
+          <Text tagName="span">Default LLM Prompt&nbsp;</Text>
+          <Text tagName="span" className="optional-text">
+            (optional)
+          </Text>
+          <Tabs
+            selectedTabId={courseHelpTextSelectedTab}
+            onChange={onChangeTabs}
+            className="module-help-text-tabs"
+          >
+            <Tab id={CourseHelpTextEditorTab.WRITE} title="Write" />
+            <Tab id={CourseHelpTextEditorTab.PREVIEW} title="Preview" />
+          </Tabs>
+          {courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && (
+            <TextArea
+              id="defaultLlmPrompt"
+              className="input-textarea"
+              fill={true}
+              value={courseConfig.defaultLlmPrompt}
+              onChange={e =>
+                setCourseConfig({
+                  ...courseConfig,
+                  defaultLlmPrompt: e.target.value
+                })
+              }
+            />
+          )}
+          {courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && (
+            <div className="input-markdown">
+              <Markdown content={courseConfig.defaultLlmPrompt || ''} openLinksInNewWindow />
+            </div>
+          )}
+        </FormGroup>
+
         <div className="boolean-container">
           <div>
             <Switch
diff --git a/src/commons/mocks/UserMocks.ts b/src/commons/mocks/UserMocks.ts
index 0517e6a96e..4056c04cca 100644
--- a/src/commons/mocks/UserMocks.ts
+++ b/src/commons/mocks/UserMocks.ts
@@ -134,6 +134,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: '',
+    defaultLlmPrompt: '',
     assetsPrefix: ''
   },
   {
@@ -147,6 +148,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_2,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text!',
+    defaultLlmPrompt: 'Default LLM Prompt',
     assetsPrefix: ''
   }
 ];
diff --git a/src/commons/sagas/__tests__/BackendSaga.ts b/src/commons/sagas/__tests__/BackendSaga.ts
index 4bc740624f..b88760c6d5 100644
--- a/src/commons/sagas/__tests__/BackendSaga.ts
+++ b/src/commons/sagas/__tests__/BackendSaga.ts
@@ -177,6 +177,7 @@ const mockCourseConfiguration1: CourseConfiguration = {
   sourceChapter: Chapter.SOURCE_1,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
+  defaultLlmPrompt: 'default LLM prompt',
   assetsPrefix: ''
 };
 
@@ -208,6 +209,7 @@ const mockCourseConfiguration2: CourseConfiguration = {
   sourceChapter: Chapter.SOURCE_4,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
+  defaultLlmPrompt: 'default LLM prompt',
   assetsPrefix: ''
 };
 
@@ -898,6 +900,7 @@ describe('Test UPDATE_COURSE_CONFIG action', () => {
     sourceChapter: Chapter.SOURCE_4,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help',
+    defaultLlmPrompt: 'default LLM prompt',
     assetsPrefix: ''
   };
 
@@ -995,7 +998,8 @@ describe('Test CREATE_COURSE action', () => {
     enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: 'Help Text'
+    moduleHelpText: 'Help Text',
+    defaultLlmPrompt: 'default Llm prompt'
   };
   const user = mockUser;
   const courseConfiguration = mockCourseConfiguration1;
diff --git a/src/features/academy/__tests__/AcademyActions.ts b/src/features/academy/__tests__/AcademyActions.ts
index fa02cadf36..4a29307372 100644
--- a/src/features/academy/__tests__/AcademyActions.ts
+++ b/src/features/academy/__tests__/AcademyActions.ts
@@ -34,7 +34,8 @@ test('createCourse generates correct action object', () => {
     enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: 'Help Text'
+    moduleHelpText: 'Help Text',
+    defaultLlmPrompt: 'default LLM prompt'
   };
 
   const action = createCourse(courseConfig);
diff --git a/src/pages/__tests__/localStorage.test.ts b/src/pages/__tests__/localStorage.test.ts
index d26314adba..9ad03c3a97 100644
--- a/src/pages/__tests__/localStorage.test.ts
+++ b/src/pages/__tests__/localStorage.test.ts
@@ -22,6 +22,7 @@ const mockShortDefaultState: SavedState = {
     enableSourcecast: defaultState.session.enableSourcecast,
     enableStories: defaultState.session.enableStories,
     moduleHelpText: defaultState.session.moduleHelpText,
+    defaultLlmPrompt: defaultState.session.defaultLlmPrompt,
     assetsPrefix: defaultState.session.assetsPrefix,
     assessmentConfigurations: defaultState.session.assessmentConfigurations
   },
diff --git a/src/pages/academy/adminPanel/AdminPanel.tsx b/src/pages/academy/adminPanel/AdminPanel.tsx
index bc4fec9048..a36b1c52bd 100644
--- a/src/pages/academy/adminPanel/AdminPanel.tsx
+++ b/src/pages/academy/adminPanel/AdminPanel.tsx
@@ -46,7 +46,8 @@ const AdminPanel: React.FC = () => {
     enableAchievements: true,
     enableSourcecast: true,
     enableStories: false,
-    moduleHelpText: ''
+    moduleHelpText: '',
+    defaultLlmPrompt: ''
   });
 
   const dispatch = useDispatch();
@@ -86,7 +87,8 @@ const AdminPanel: React.FC = () => {
       enableAchievements: session.enableAchievements,
       enableSourcecast: session.enableSourcecast,
       enableStories: session.enableStories,
-      moduleHelpText: session.moduleHelpText
+      moduleHelpText: session.moduleHelpText,
+      defaultLlmPrompt: session.defaultLlmPrompt
     });
 
     // IMPT: To prevent mutation of props
diff --git a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
index 023c659038..a83252b874 100644
--- a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
@@ -20,6 +20,48 @@ export enum CourseHelpTextEditorTab {
   PREVIEW = 'PREVIEW'
 }
 
+export enum DefaultLlmPromptTab {
+  WRITE = 'WRITE',
+  PREVIEW = 'PREVIEW'
+}
+
+type ConfigInputProps = {
+  label: string;
+  value?: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  helperText: string;
+  id: string;
+};
+
+const ConfigInput: React.FC<ConfigInputProps> = ({ label, value, onChange, helperText, id }) => (
+  <FormGroup helperText={helperText} inline={true} label={label} labelFor={id}>
+    <InputGroup id={id} value={value || ''} onChange={onChange} />
+  </FormGroup>
+);
+
+type TabPanelProps = {
+  selectedTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab;
+  onChange: (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => void;
+  tabs: {
+    id: CourseHelpTextEditorTab | DefaultLlmPromptTab;
+    title: string;
+    panel: React.ReactNode;
+  }[];
+};
+
+const TabPanel: React.FC<TabPanelProps> = ({ selectedTabId, onChange, tabs }) => (
+  <Tabs
+    selectedTabId={selectedTabId}
+    onChange={newTabId => onChange(newTabId as CourseHelpTextEditorTab | DefaultLlmPromptTab)}
+    className="module-help-text-tabs"
+  >
+    {tabs.map(tab => (
+      <Tab id={tab.id.toString()} title={tab.title} key={tab.id.toString()} />
+    ))}
+    {tabs.map(tab => selectedTabId === tab.id && tab.panel)}
+  </Tabs>
+);
+
 type Props = {
   courseConfiguration: UpdateCourseConfiguration;
   setCourseConfiguration: (courseConfiguration: UpdateCourseConfiguration) => void;
@@ -27,8 +69,13 @@ type Props = {
 
 const CourseConfigPanel: React.FC<Props> = props => {
   const { isMobileBreakpoint } = useResponsive();
-  const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
-    React.useState<CourseHelpTextEditorTab>(CourseHelpTextEditorTab.WRITE);
+  const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] = React.useState<
+    CourseHelpTextEditorTab | DefaultLlmPromptTab
+  >(CourseHelpTextEditorTab.WRITE);
+
+  const [defaultLlmPromptSelectedTab, setDefaultLlmPromptSelectedTab] = React.useState<
+    CourseHelpTextEditorTab | DefaultLlmPromptTab
+  >(DefaultLlmPromptTab.WRITE);
 
   const {
     courseName,
@@ -38,42 +85,28 @@ const CourseConfigPanel: React.FC<Props> = props => {
     enableAchievements,
     enableSourcecast,
     enableStories,
-    moduleHelpText
+    moduleHelpText,
+    defaultLlmPrompt
   } = props.courseConfiguration;
 
-  const writePanel = (
-    <TextArea
-      id="moduleHelpText"
-      className="input-textarea"
-      fill={true}
-      value={moduleHelpText || ''}
-      onChange={e =>
-        props.setCourseConfiguration({
-          ...props.courseConfiguration,
-          moduleHelpText: e.target.value
-        })
+  const onChangeTabs = React.useCallback(
+    (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => {
+      if (newTabId === courseHelpTextSelectedTab) {
+        return;
       }
-    />
-  );
-
-  const previewPanel = (
-    <div className="input-markdown">
-      <Markdown content={moduleHelpText || ''} openLinksInNewWindow />
-    </div>
+      setCourseHelpTextSelectedTab(newTabId);
+    },
+    [courseHelpTextSelectedTab]
   );
 
-  const onChangeTabs = React.useCallback(
-    (
-      newTabId: CourseHelpTextEditorTab,
-      prevTabId: CourseHelpTextEditorTab,
-      event: React.MouseEvent<HTMLElement>
-    ) => {
-      if (newTabId === prevTabId) {
+  const onChangeTab = React.useCallback(
+    (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => {
+      if (newTabId === defaultLlmPromptSelectedTab) {
         return;
       }
-      setCourseHelpTextSelectedTab(newTabId);
+      setDefaultLlmPromptSelectedTab(newTabId);
     },
-    [setCourseHelpTextSelectedTab]
+    [defaultLlmPromptSelectedTab]
   );
 
   return (
@@ -82,57 +115,115 @@ const CourseConfigPanel: React.FC<Props> = props => {
       <H3>{courseShortName}</H3>
       <div className="inputs">
         <div className="text">
-          <FormGroup
-            helperText="Please enter the course name that will be used for course selection."
-            inline={true}
+          <ConfigInput
             label="Course Name"
-            labelFor="courseName"
-          >
-            <InputGroup
-              id="courseName"
-              defaultValue={courseName}
-              onChange={e =>
-                props.setCourseConfiguration({
-                  ...props.courseConfiguration,
-                  courseName: e.target.value
-                })
-              }
-            />
-          </FormGroup>
-          <FormGroup
-            helperText="Please enter the course short name. This will be displayed on the top left."
-            inline={true}
+            value={courseName}
+            onChange={e =>
+              props.setCourseConfiguration({
+                ...props.courseConfiguration,
+                courseName: e.target.value
+              })
+            }
+            helperText="Please enter the course name that will be used for course selection."
+            id="courseName"
+          />
+
+          <ConfigInput
             label="Course Short Name"
-            labelFor="courseShortName"
-          >
-            <InputGroup
-              id="courseShortName"
-              defaultValue={courseShortName}
-              onChange={e =>
-                props.setCourseConfiguration({
-                  ...props.courseConfiguration,
-                  courseShortName: e.target.value
-                })
-              }
-            />
-          </FormGroup>
+            value={courseShortName}
+            onChange={e =>
+              props.setCourseConfiguration({
+                ...props.courseConfiguration,
+                courseShortName: e.target.value
+              })
+            }
+            helperText="Please enter the course short name. This will be displayed on the top left."
+            id="courseShortName"
+          />
+
           <FormGroup
             helperText="Please enter the module help text that will be used in the course help dialog."
             inline={true}
             label="Module Help Text"
             labelFor="moduleHelpText"
           >
-            <Tabs
+            <TabPanel
               selectedTabId={courseHelpTextSelectedTab}
               onChange={onChangeTabs}
-              className="module-help-text-tabs"
-            >
-              <Tab id={CourseHelpTextEditorTab.WRITE} title="Write" />
-              <Tab id={CourseHelpTextEditorTab.PREVIEW} title="Preview" />
-            </Tabs>
-            {courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && writePanel}
-            {courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && previewPanel}
+              tabs={[
+                {
+                  id: CourseHelpTextEditorTab.WRITE,
+                  title: 'Write',
+                  panel: (
+                    <TextArea
+                      id="moduleHelpText"
+                      className="input-textarea"
+                      fill={true}
+                      value={moduleHelpText || ''}
+                      onChange={e =>
+                        props.setCourseConfiguration({
+                          ...props.courseConfiguration,
+                          moduleHelpText: e.target.value
+                        })
+                      }
+                    />
+                  )
+                },
+                {
+                  id: CourseHelpTextEditorTab.PREVIEW,
+                  title: 'Preview',
+                  panel: (
+                    <div className="input-markdown">
+                      <Markdown content={moduleHelpText || ''} openLinksInNewWindow />
+                    </div>
+                  )
+                }
+              ]}
+            />
           </FormGroup>
+
+          <FormGroup
+            helperText="Please enter the default LLM prompt that will be used in this course"
+            inline={true}
+            label="Default LLM Prompt"
+            labelFor="defaultLlmPrompt"
+          >
+            <TabPanel
+              selectedTabId={defaultLlmPromptSelectedTab}
+              onChange={onChangeTab}
+              tabs={[
+                {
+                  id: DefaultLlmPromptTab.WRITE,
+                  title: 'Write',
+                  panel: (
+                    <TextArea
+                      id="defaultLlmPrompt"
+                      className="input-textarea"
+                      fill={true}
+                      value={defaultLlmPrompt || ''}
+                      onChange={e =>
+                        props.setCourseConfiguration({
+                          ...props.courseConfiguration,
+                          defaultLlmPrompt: e.target.value
+                        })
+                      }
+                    />
+                  )
+                },
+                {
+                  id: DefaultLlmPromptTab.PREVIEW,
+                  title: 'Preview',
+                  panel: (
+                    <div className="input-markdown">
+                      <Markdown content={defaultLlmPrompt || ''} openLinksInNewWindow />
+                    </div>
+                  )
+                }
+              ]}
+            />
+          </FormGroup>
+
+          {/* ... Other inputs */}
         </div>
         {!isMobileBreakpoint && <Divider />}
         <div className="booleans">
diff --git a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
index 64c9de8be6..fb1d044761 100644
--- a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
@@ -310,11 +310,7 @@ const GradingWorkspace: React.FC<Props> = props => {
             studentName={grading!.answers[questionId].student.name}
             studentUsername={grading!.answers[questionId].student.username}
             comments={grading!.answers[questionId].grade.comments ?? ''}
-            graderName={
-              grading!.answers[questionId].grade.grader
-                ? grading!.answers[questionId].grade.grader!.name
-                : undefined
-            }
+            graderName={grading!.answers[questionId].grade.grader?.name}
             gradedAt={
               grading!.answers[questionId].grade.grader
                 ? grading!.answers[questionId].grade.gradedAt!
diff --git a/src/pages/localStorage.ts b/src/pages/localStorage.ts
index 261f8b8c1d..b68d426902 100644
--- a/src/pages/localStorage.ts
+++ b/src/pages/localStorage.ts
@@ -70,6 +70,7 @@ export const saveState = (state: OverallState) => {
         enableSourcecast: state.session.enableSourcecast,
         enableStories: state.session.enableStories,
         moduleHelpText: state.session.moduleHelpText,
+        defaultLlmPrompt: state.session.defaultLlmPrompt,
         assetsPrefix: state.session.assetsPrefix,
         assessmentConfigurations: state.session.assessmentConfigurations,
         notificationConfigs: state.session.notificationConfigs,