diff --git a/client/src/api.ts b/client/src/api.ts
index ce3c155d..97ed1469 100644
--- a/client/src/api.ts
+++ b/client/src/api.ts
@@ -254,6 +254,7 @@ export async function fetchConfig(): Promise<Config> {
       query FetchConfig{
         config {
           classifierLambdaEndpoint
+          filterEmailMentorAddress
           uploadLambdaEndpoint
           subjectRecordPriority
           videoRecorderMaxLength
@@ -354,6 +355,8 @@ export async function fetchUsers(
                     viewPermission
                     editPermission
                   }
+                  idleRecordingDuration
+                  introRecordingText
                   loginHeaderText
                   welcomeSlideHeader
                   welcomeSlideText
@@ -1088,6 +1091,8 @@ export async function fetchMentorById(
             lockedToSubjects
             publiclyVisible
             mentorType
+            idleRecordingDuration
+            introRecordingText
             orgPermissions{
               org
               viewPermission
@@ -1271,6 +1276,8 @@ export async function fetchMentorConfig(
             lockedToSubjects
             publiclyVisible
             mentorType
+            introRecordingText
+            idleRecordingDuration
             orgPermissions{
               org
               viewPermission
@@ -2833,6 +2840,7 @@ export async function fetchOrganizations(
                 }
                 config {
                   classifierLambdaEndpoint
+                  filterEmailMentorAddress
                   uploadLambdaEndpoint
                   subjectRecordPriority
                   videoRecorderMaxLength
@@ -2932,6 +2940,7 @@ export async function addOrUpdateOrganization(
             }
             config {
               classifierLambdaEndpoint
+              filterEmailMentorAddress
               uploadLambdaEndpoint
               subjectRecordPriority
               videoRecorderMaxLength
@@ -3016,6 +3025,7 @@ export async function updateOrgConfig(
         me {
           updateOrgConfig(id: $id, config: $config) {
             classifierLambdaEndpoint
+            filterEmailMentorAddress
             uploadLambdaEndpoint
             subjectRecordPriority
             videoRecorderMaxLength
@@ -3073,6 +3083,7 @@ export async function updateOrgConfig(
         id,
         config: {
           styleHeaderTitle: config.styleHeaderTitle,
+          filterEmailMentorAddress: config.filterEmailMentorAddress,
           styleHeaderText: config.styleHeaderText,
           styleHeaderColor: config.styleHeaderColor,
           styleHeaderTextColor: config.styleHeaderTextColor,
@@ -3131,6 +3142,7 @@ export async function updateConfig(
         me {
           updateConfig(config: $config) {
             classifierLambdaEndpoint
+            filterEmailMentorAddress
             uploadLambdaEndpoint
             subjectRecordPriority
             videoRecorderMaxLength
@@ -3187,6 +3199,7 @@ export async function updateConfig(
       variables: {
         config: {
           styleHeaderTitle: config.styleHeaderTitle,
+          filterEmailMentorAddress: config.filterEmailMentorAddress,
           styleHeaderText: config.styleHeaderText,
           styleHeaderColor: config.styleHeaderColor,
           styleHeaderTextColor: config.styleHeaderTextColor,
diff --git a/client/src/components/config/other-settings.tsx b/client/src/components/config/other-settings.tsx
index f22ecb0c..5d511762 100644
--- a/client/src/components/config/other-settings.tsx
+++ b/client/src/components/config/other-settings.tsx
@@ -161,6 +161,18 @@ export function Settings(props: {
           shrink: true,
         }}
       />
+      <TextField
+        fullWidth
+        data-cy="org-email-input"
+        data-test={config.filterEmailMentorAddress}
+        variant="outlined"
+        label="'Email Mentor' Email Address"
+        value={config.filterEmailMentorAddress}
+        onChange={(e) =>
+          updateConfig({ filterEmailMentorAddress: e.target.value })
+        }
+        style={{ marginBottom: 20 }}
+      />
       <FormControl variant="outlined" fullWidth>
         <InputLabel>Question Sort Order</InputLabel>
         <Select
diff --git a/client/src/components/home/answer-item.tsx b/client/src/components/home/answer-item.tsx
index 84f0678f..c75e1fba 100644
--- a/client/src/components/home/answer-item.tsx
+++ b/client/src/components/home/answer-item.tsx
@@ -22,8 +22,16 @@ function AnswerItem(props: {
   question: QuestionEdits;
   onEditQuestion: (question: QuestionEdits) => void;
   onRecordOne: (question: QuestionEdits) => void;
+  isCompleteAnswer: boolean;
 }): JSX.Element {
-  const { mentorId, answer, question, onEditQuestion, onRecordOne } = props;
+  const {
+    mentorId,
+    answer,
+    question,
+    onEditQuestion,
+    onRecordOne,
+    isCompleteAnswer,
+  } = props;
   const [questionInput, setQuestionInput] = useState<string>(
     question.newQuestionText
   );
@@ -78,7 +86,9 @@ function AnswerItem(props: {
         </span>
       ) : (
         <ListItemText
-          primary={question?.originalQuestion.question}
+          primary={
+            question?.customQuestionText || question.originalQuestion.question
+          }
           secondary={`${answer.transcript.substring(0, 100)}${
             answer.transcript.length > 100 ? "..." : ""
           }`}
@@ -93,7 +103,7 @@ function AnswerItem(props: {
           endIcon={<PlayArrowIcon />}
           onClick={() => onRecordOne(question)}
         >
-          Record
+          {isCompleteAnswer ? "Edit" : "Record"}
         </Button>
       </ListItemSecondaryAction>
     </div>
diff --git a/client/src/components/home/answer-list.tsx b/client/src/components/home/answer-list.tsx
index a3528fa1..325486f6 100644
--- a/client/src/components/home/answer-list.tsx
+++ b/client/src/components/home/answer-list.tsx
@@ -22,6 +22,7 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import { Answer } from "types";
 import AnswerItem from "./answer-item";
 import { QuestionEdits } from "hooks/graphql/use-with-review-answer-state";
+import { COMPLETE_ANSWER_HEADER } from "./recording-block";
 
 function AnswerList(props: {
   classes: Record<string, string>;
@@ -47,6 +48,7 @@ function AnswerList(props: {
     onAddQuestion,
   } = props;
   const [isExpanded, setExpanded] = React.useState(false);
+  const isCompleteAnswers = header === COMPLETE_ANSWER_HEADER;
 
   useEffect(() => {
     setExpanded(props.expandLists);
@@ -83,7 +85,7 @@ function AnswerList(props: {
               onClick={onRecordAll}
               disabled={answers.length === 0}
             >
-              Record All
+              {isCompleteAnswers ? "Review All" : "Record All"}
             </Button>
             {onAddQuestion ? (
               <Button
@@ -129,6 +131,7 @@ function AnswerList(props: {
                     question={question}
                     onEditQuestion={onEditQuestion}
                     onRecordOne={onRecordOne}
+                    isCompleteAnswer={isCompleteAnswers}
                   />
                 </ListItem>
               );
diff --git a/client/src/components/home/recording-block.tsx b/client/src/components/home/recording-block.tsx
index de4e6cab..8614895c 100644
--- a/client/src/components/home/recording-block.tsx
+++ b/client/src/components/home/recording-block.tsx
@@ -15,6 +15,9 @@ import {
 } from "hooks/graphql/use-with-review-answer-state";
 import { isAnswerComplete } from "helpers";
 
+export const INCOMPLETE_ANSWER_HEADER = "Incomplete";
+export const COMPLETE_ANSWER_HEADER = "Complete";
+
 export default function RecordingBlockItem(props: {
   classes: Record<string, string>;
   block: RecordingBlock;
@@ -79,7 +82,7 @@ export default function RecordingBlockItem(props: {
             classes={classes}
             subjectId={block.subject}
             mentorId={props.mentorId}
-            header="Complete"
+            header={COMPLETE_ANSWER_HEADER}
             answers={complete}
             questions={questionEdits}
             expandLists={props.expandAllRecordingBlocks}
@@ -97,7 +100,7 @@ export default function RecordingBlockItem(props: {
           <AnswerList
             classes={classes}
             subjectId={block.subject}
-            header="Incomplete"
+            header={INCOMPLETE_ANSWER_HEADER}
             answers={incomplete}
             questions={questionEdits}
             expandLists={props.expandAllRecordingBlocks}
diff --git a/client/src/components/record/video-recorder.tsx b/client/src/components/record/video-recorder.tsx
index 125a389c..3b9ca949 100644
--- a/client/src/components/record/video-recorder.tsx
+++ b/client/src/components/record/video-recorder.tsx
@@ -507,11 +507,11 @@ function VideoRecorder(props: {
           style={{
             color: "white",
             position: "absolute",
-            top: height / 2,
+            top: height / 4,
             bottom: height / 2,
             left: width / 2,
             right: width / 2,
-            visibility: countdownInProgress ? "visible" : "hidden",
+            visibility: countdownInProgress ? "visible" : "visible",
           }}
         >
           {recordStartCountdown ||
@@ -525,6 +525,23 @@ function VideoRecorder(props: {
             ) ||
             ""}
         </Typography>
+        {recordStartCountdown && (
+          <Typography
+            data-cy="countdown-message"
+            variant="h2"
+            align="center"
+            style={{
+              color: "white",
+              position: "absolute",
+
+              bottom: 0,
+              width: width,
+              visibility: countdownInProgress ? "visible" : "visible",
+            }}
+          >
+            Press Spacebar to stop recording.
+          </Typography>
+        )}
       </div>
       <div
         data-cy="controls"
diff --git a/client/src/components/setup/mentor-goal-slide.tsx b/client/src/components/setup/mentor-goal-slide.tsx
index 1372d5ce..d9ce4e0b 100644
--- a/client/src/components/setup/mentor-goal-slide.tsx
+++ b/client/src/components/setup/mentor-goal-slide.tsx
@@ -22,15 +22,31 @@ export function MentorGoalSlide(props: {
       classes={props.classes}
       title="My Goal"
       content={
-        <div>
-          <Typography variant="h4">
-            What do you really want someone to take away from talking to your
-            mentor? (1-2 sentences)
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "column",
+            justifyContent: "center",
+            alignItems: "center",
+            width: "100%",
+          }}
+        >
+          <Typography
+            variant="h4"
+            style={{
+              width: "80%",
+              textAlign: "center",
+              alignSelf: "center",
+            }}
+          >
+            Think how you would describe yourself to a mentee, what do you
+            really want someone to take away from talking to your mentor?
           </Typography>
           <TextField
             required
             data-cy="goal-input"
             variant="outlined"
+            placeholder="Enter your goal here..."
             multiline
             minRows={6}
             value={mentor.goal || ""}
diff --git a/client/src/components/setup/mentor-info-slide.tsx b/client/src/components/setup/mentor-info-slide.tsx
index 89f473d3..b6a8cf58 100644
--- a/client/src/components/setup/mentor-info-slide.tsx
+++ b/client/src/components/setup/mentor-info-slide.tsx
@@ -5,11 +5,11 @@ Permission to use, copy, modify, and distribute this software and its documentat
 The full terms of this copyright and license should always be found in the root directory of this software deliverable as "license.txt" and if these terms are not found with this software, please contact the USC Stevens Center for the full license.
 */
 import React, { useEffect, useState } from "react";
-import { Checkbox, FormControlLabel, TextField } from "@mui/material";
+import { Checkbox, FormControlLabel, TextField, Tooltip } from "@mui/material";
 import { Mentor } from "types";
 import { Slide } from "./slide";
 import { onTextInputChanged } from "helpers";
-
+import HelpOutlineIcon from "@mui/icons-material/HelpOutline";
 export function MentorInfoSlide(props: {
   classes: Record<string, string>;
   mentor: Mentor;
@@ -37,7 +37,13 @@ export function MentorInfoSlide(props: {
       classes={props.classes}
       title="Tell us a little about yourself."
       content={
-        <div>
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "column",
+            width: "100%",
+          }}
+        >
           <TextField
             style={{
               width: "90%",
@@ -100,19 +106,44 @@ export function MentorInfoSlide(props: {
             }}
             className={classes.inputField}
           />
-          <FormControlLabel
-            control={
-              <Checkbox
-                checked={mentor.allowContact}
-                onChange={() =>
-                  editMentor({ allowContact: !mentor.allowContact })
-                }
-                color="secondary"
+          <div
+            style={{
+              display: "flex",
+              flexDirection: "row",
+              alignItems: "center",
+            }}
+          >
+            <FormControlLabel
+              control={
+                <Checkbox
+                  checked={mentor.allowContact}
+                  onChange={() =>
+                    editMentor({ allowContact: !mentor.allowContact })
+                  }
+                  color="secondary"
+                />
+              }
+              label="Allow people to contact me"
+              style={{
+                width: "fit-content",
+                alignSelf: "flex-start",
+                marginLeft: 0,
+                marginRight: 2,
+              }}
+            />
+            <Tooltip
+              title="Your organization will screen emails before you receive them."
+              placement="top"
+            >
+              <HelpOutlineIcon
+                style={{
+                  color: "gray",
+                  cursor: "pointer",
+                  margin: 0,
+                }}
               />
-            }
-            label="Allow people to contact me"
-            style={{ width: "89%", alignSelf: "left" }}
-          />
+            </Tooltip>
+          </div>
         </div>
       }
     />
diff --git a/client/src/components/setup/select-keywords-slide.tsx b/client/src/components/setup/select-keywords-slide.tsx
index 8a81caba..fe74bf89 100644
--- a/client/src/components/setup/select-keywords-slide.tsx
+++ b/client/src/components/setup/select-keywords-slide.tsx
@@ -117,6 +117,9 @@ export function SelectKeywordsSlide(props: {
                       renderInput={(params) => (
                         <TextField
                           {...params}
+                          style={{
+                            marginLeft: 10,
+                          }}
                           variant="outlined"
                           placeholder={`Choose ${kw.type.toLowerCase()}`}
                         />
@@ -156,8 +159,26 @@ export function SelectKeywordsSlide(props: {
                   )}
                 </div>
               ))}
+              <div
+                style={{
+                  display: "flex",
+                  flexDirection: "row",
+                  flexWrap: "wrap",
+                }}
+              >
+                {mentor.keywords.map((k) => (
+                  <Chip
+                    key={`keyword-${k}`}
+                    data-cy={`keyword-${k}`}
+                    label={k}
+                    onDelete={() => removeKeyword(k)}
+                    style={{ margin: 5 }}
+                  />
+                ))}
+              </div>
               <Autocomplete
                 data-cy="keyword-input"
+                title="Your Keywords"
                 multiple
                 freeSolo
                 value={mentor.keywords}
@@ -168,23 +189,15 @@ export function SelectKeywordsSlide(props: {
                     keywords: v,
                   })
                 }
-                renderTags={(value: readonly string[], getTagProps) =>
-                  value.map((option: string, index: number) => (
-                    <Chip
-                      data-cy={`keyword-${option}`}
-                      label={option}
-                      {...getTagProps({ index })}
-                      key={`keyword-${option}`}
-                    />
-                  ))
-                }
+                renderTags={() => <></>}
                 renderInput={(params) => (
                   <TextField
                     {...params}
                     variant="outlined"
-                    placeholder="Enter your own keyword"
+                    placeholder="Enter your own keywords"
                   />
                 )}
+                disableClearable
                 renderOption={(props, option) => (
                   <Typography
                     {...props}
diff --git a/client/src/helpers.ts b/client/src/helpers.ts
index ad6d693d..5c62c0dc 100644
--- a/client/src/helpers.ts
+++ b/client/src/helpers.ts
@@ -255,6 +255,10 @@ export function isAnswerComplete(
   );
 }
 
+export function doesVideoExist(answer: Answer): boolean {
+  return Boolean(answer.media?.find((m) => m.type === MediaType.VIDEO)?.url);
+}
+
 export function getFileSizeInMb(file: File): number {
   return file.size / 1024 / 1024;
 }
diff --git a/client/src/hooks/graphql/use-with-record-state.tsx b/client/src/hooks/graphql/use-with-record-state.tsx
index 85067f9b..626f0951 100644
--- a/client/src/hooks/graphql/use-with-record-state.tsx
+++ b/client/src/hooks/graphql/use-with-record-state.tsx
@@ -170,6 +170,7 @@ export function useWithRecordState(
           answer: a,
           editedAnswer: a,
           editedQuestion: q.question,
+          customDisplayQuestionText: q.customQuestionText,
           recordedVideo: answerInState?.recordedVideo || undefined,
           minVideoLength: q.question.minVideoLength,
           attentionNeeded: doesAnswerNeedAttention(a),
diff --git a/client/src/hooks/graphql/use-with-review-answer-state.tsx b/client/src/hooks/graphql/use-with-review-answer-state.tsx
index a7e0c9f4..ce5dbc19 100644
--- a/client/src/hooks/graphql/use-with-review-answer-state.tsx
+++ b/client/src/hooks/graphql/use-with-review-answer-state.tsx
@@ -73,6 +73,7 @@ interface UseWithReviewAnswerState {
 export interface QuestionEdits {
   originalQuestion: Question;
   newQuestionText: string;
+  customQuestionText?: string;
   unsavedChanges: boolean;
 }
 
@@ -123,6 +124,7 @@ export function useWithReviewAnswerState(
         .map((q) => ({
           originalQuestion: q.question!,
           newQuestionText: q.question!.question,
+          customQuestionText: q.customQuestionText,
           // freshly loaded questions cannot have unsaved changes
           unsavedChanges: false,
         }))
diff --git a/client/src/hooks/graphql/use-with-upload-list-item.tsx b/client/src/hooks/graphql/use-with-upload-list-item.tsx
index 5ea1e5f1..b7d977fa 100644
--- a/client/src/hooks/graphql/use-with-upload-list-item.tsx
+++ b/client/src/hooks/graphql/use-with-upload-list-item.tsx
@@ -54,6 +54,11 @@ export function useWithUploadListItem(
     }
   }
 
+  const question = getValueIfKeyExists(
+    upload.question,
+    recordState.mentorQuestions
+  );
+
   return {
     upload,
     isJobDone,
@@ -65,8 +70,7 @@ export function useWithUploadListItem(
     cancelling,
     needsAttention,
     jobTitle:
-      getValueIfKeyExists(upload.question, recordState.mentorQuestions)
-        ?.question?.question || "",
+      question?.customQuestionText || question?.question?.question || "",
     pollStatusCount: recordState.pollStatusCount,
     onClose,
   };
diff --git a/client/src/pages/record.tsx b/client/src/pages/record.tsx
index 9f71d1e3..29f33abf 100644
--- a/client/src/pages/record.tsx
+++ b/client/src/pages/record.tsx
@@ -39,7 +39,11 @@ import NavBar from "components/nav-bar";
 import ProgressBar from "components/progress-bar";
 import UploadingWidget from "components/record/uploading-widget";
 import VideoPlayer from "components/record/video-player";
-import { getValueIfKeyExists, sanitizeWysywigString } from "helpers";
+import {
+  doesVideoExist,
+  getValueIfKeyExists,
+  sanitizeWysywigString,
+} from "helpers";
 import withAuthorizationOnly from "hooks/wrap-with-authorization-only";
 import { ConfigStatus } from "store/slices/config";
 import { useWithConfig } from "store/slices/config/useWithConfig";
@@ -202,6 +206,7 @@ function RecordPage(props: {
   const { browserSupportsVbg } = useWithBrowser();
   const mentorId = getData((state) => state.data?._id);
   const mentorType = getData((state) => state.data?.mentorType);
+  const isVideoMentor = mentorType === MentorType.VIDEO;
   const mentorConfig: MentorConfig | undefined = getData(
     (state) => state.data?.mentorConfig
   );
@@ -347,6 +352,11 @@ function RecordPage(props: {
       return;
     }
     const { isRecording } = recordState;
+    const placeHolder = isVideoMentor
+      ? doesVideoExist(curAnswer.answer)
+        ? "Enter your transcript here..."
+        : "Transcript will be auto-generated and shown here once you upload the video"
+      : "Enter your response here...";
     return (
       // relative so overlay can fit
       <div
@@ -370,7 +380,7 @@ function RecordPage(props: {
             saveAnswer={recordState.saveAnswer}
             accessToken={props.accessToken}
           />
-          {warnEmptyTranscript ? (
+          {warnEmptyTranscript && isVideoMentor ? (
             <text
               data-cy="warn-empty-transcript"
               style={{ fontWeight: "normal" }}
@@ -385,6 +395,7 @@ function RecordPage(props: {
           wrapperClassName="wrapper-class"
           editorClassName="editor-class"
           toolbarClassName="toolbar-class"
+          placeholder={placeHolder}
           toolbar={toolBarOpts}
           onEditorStateChange={(editorState: EditorState) => {
             const contentState = editorState.getCurrentContent();
@@ -470,7 +481,7 @@ function RecordPage(props: {
           </span>
         ) : undefined}
 
-        {mentorType === MentorType.VIDEO ? (
+        {isVideoMentor ? (
           <div
             data-cy="videoplayer-container"
             className={classes.block}
@@ -568,7 +579,8 @@ function RecordPage(props: {
               }}
             >
               <Typography data-cy="question-text">
-                {curEditedQuestion?.question}
+                {curAnswer.customDisplayQuestionText ||
+                  curEditedQuestion?.question}
               </Typography>
               {curAnswerBelongsToMentor ? (
                 <IconButton
diff --git a/client/src/store/slices/questions/index.ts b/client/src/store/slices/questions/index.ts
index 88cd4ea1..4c6cb7c5 100644
--- a/client/src/store/slices/questions/index.ts
+++ b/client/src/store/slices/questions/index.ts
@@ -8,18 +8,22 @@ import { fetchQuestionsById, updateQuestion } from "api";
 import { getValueIfKeyExists } from "helpers";
 import { LoadingError, LoadingStatus } from "hooks/graphql/loading-reducer";
 import { RootState } from "store/store";
-import { Question } from "types";
+import { Question, UtteranceName } from "types";
+import { MentorConfig } from "types-gql";
 
 /** Store */
 
+type QuestionsRecord = Record<string, QuestionState>;
+
 export interface QuestionsState {
-  questions: Record<string, QuestionState>;
+  questions: QuestionsRecord;
   batchLoadStatus: LoadingStatus;
   batchLoadError?: LoadingError;
 }
 
 export interface QuestionState {
   question?: Question;
+  customQuestionText?: string;
   status: LoadingStatus;
   error?: LoadingError;
 }
@@ -36,12 +40,16 @@ interface CancellabeResult<T> {
 
 /** Actions */
 
+interface LoadQuestionsByIdRes<T> extends CancellabeResult<T> {
+  mentorConfig?: MentorConfig;
+}
+
 export const loadQuestionsById = createAsyncThunk(
   "questions/loadQuestionsById",
   async (
-    args: { ids: string[]; reload?: boolean },
+    args: { ids: string[]; reload?: boolean; mentorConfig?: MentorConfig },
     thunkAPI
-  ): Promise<CancellabeResult<Question[]>> => {
+  ): Promise<LoadQuestionsByIdRes<Question[]>> => {
     const state = thunkAPI.getState() as RootState;
     const ids = args.reload
       ? args.ids.filter((id) => id)
@@ -58,7 +66,11 @@ export const loadQuestionsById = createAsyncThunk(
       return { isCancelled: true };
     }
     thunkAPI.dispatch(questionsSlice.actions.loadingQuestionsInProgress(ids));
-    return { result: await fetchQuestionsById(ids) };
+    const questions = await fetchQuestionsById(ids);
+    return {
+      result: questions,
+      mentorConfig: args.mentorConfig,
+    };
   }
 );
 
@@ -74,8 +86,36 @@ export const saveQuestion = createAsyncThunk(
   }
 );
 
-/** Reducer */
+function applyQuestionConfigData(
+  mentorConfig: MentorConfig,
+  data: QuestionsRecord
+): QuestionsRecord {
+  if (
+    !mentorConfig?.introRecordingText &&
+    !mentorConfig?.idleRecordingDuration
+  ) {
+    return data;
+  }
+  const dataCopy: QuestionsRecord = JSON.parse(JSON.stringify(data));
+  for (const [k, v] of Object.entries(dataCopy)) {
+    const isintroQuestion = v.question?.name === UtteranceName.INTRO;
+    const isIdleQuestion = v.question?.name === UtteranceName.IDLE;
+    const customQuestionText = mentorConfig.introRecordingText;
+    if (isintroQuestion && customQuestionText) {
+      dataCopy[k].customQuestionText = customQuestionText;
+    }
+    if (
+      isIdleQuestion &&
+      mentorConfig.idleRecordingDuration &&
+      dataCopy[k].question
+    ) {
+      dataCopy[k].question!.minVideoLength = mentorConfig.idleRecordingDuration;
+    }
+  }
+  return dataCopy;
+}
 
+/** Reducer */
 export const questionsSlice = createSlice({
   name: "questions",
   initialState,
@@ -135,6 +175,12 @@ export const questionsSlice = createSlice({
           };
         }
         stateCopy["batchLoadStatus"] = LoadingStatus.SUCCEEDED;
+        if (action.payload.mentorConfig) {
+          stateCopy.questions = applyQuestionConfigData(
+            action.payload.mentorConfig,
+            stateCopy.questions
+          );
+        }
         return stateCopy;
       })
       .addCase(loadQuestionsById.rejected, (state, action) => {
diff --git a/client/src/store/slices/questions/useQuestions.ts b/client/src/store/slices/questions/useQuestions.ts
index d4677255..de4e3c58 100644
--- a/client/src/store/slices/questions/useQuestions.ts
+++ b/client/src/store/slices/questions/useQuestions.ts
@@ -91,6 +91,9 @@ export function useQuestionActions(): QuestionActions {
   const data = useAppSelector((state) => {
     return state.questions.questions;
   });
+  const mentorConfig = useAppSelector(
+    (state) => state.mentor.data?.mentorConfig
+  );
 
   function loadQuestions(ids: string[], reload = false) {
     if (!reload) {
@@ -100,7 +103,7 @@ export function useQuestionActions(): QuestionActions {
     if (ids.length === 0) {
       return;
     }
-    return dispatch(loadQuestionsById({ ids, reload }));
+    return dispatch(loadQuestionsById({ ids, reload, mentorConfig }));
   }
 
   async function saveQuestion(data: Question): Promise<void> {
diff --git a/client/src/types-gql.ts b/client/src/types-gql.ts
index 2f95de6e..90f6a1df 100644
--- a/client/src/types-gql.ts
+++ b/client/src/types-gql.ts
@@ -61,6 +61,8 @@ export interface MentorConfig {
   mentorType: MentorType;
   orgPermissions: OrgPermissionsGQL[];
   loginHeaderText: string;
+  idleRecordingDuration: number;
+  introRecordingText: string;
   welcomeSlideHeader: string;
   welcomeSlideText: string;
   disableMyGoalSlide: boolean;
diff --git a/client/src/types.ts b/client/src/types.ts
index 021609b2..8ded564f 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -51,6 +51,7 @@ export interface Config {
   defaultVirtualBackground: string;
   urlDocSetup: string;
   urlVideoIdleTips: string;
+  filterEmailMentorAddress: string;
   // style settings
   styleHeaderTitle: string;
   styleHeaderText: string;
@@ -152,6 +153,7 @@ export interface Organization {
   uuid: string;
   name: string;
   subdomain: string;
+  email: string;
   isPrivate: boolean;
   accessCodes: string[];
   members: OrgMember[];
@@ -673,6 +675,7 @@ export interface AnswerState {
   answer: Answer;
   editedAnswer: Answer;
   editedQuestion: Question;
+  customDisplayQuestionText?: string;
   attentionNeeded: AnswerAttentionNeeded;
   localTranscriptChanges: boolean;
   recordedVideo?: File;
diff --git a/cypress/cypress/e2e/answer-versioning.cy.ts b/cypress/cypress/e2e/answer-versioning.cy.ts
index ac26f614..846cf8ae 100644
--- a/cypress/cypress/e2e/answer-versioning.cy.ts
+++ b/cypress/cypress/e2e/answer-versioning.cy.ts
@@ -450,17 +450,13 @@ describe("answer versioning", () => {
         cy.get("[data-cy=upload-video]").trigger("mouseover").click();
         cy.wait(3000);
         cy.get("[data-cy=close-error-dialog]").click();
-        cy.get("[data-cy=notification-dialog-button]").click();
 
         // check that previous version was stored
         cy.get("[data-cy=versions-icon]").click();
         cy.get("[data-cy=versions-dialog]").should("be.visible");
 
         cy.get("[data-cy=previous-version]").within(() => {
-          cy.get("[data-cy=transcript]").should(
-            "have.text",
-            "I'm 37 years old"
-          );
+          cy.get("[data-cy=transcript]").should("have.text", "i am aaron");
         });
 
         cy.get("[data-cy=versions-dialog-pagination]").within(() => {
@@ -468,7 +464,10 @@ describe("answer versioning", () => {
         });
 
         cy.get("[data-cy=previous-version]").within(() => {
-          cy.get("[data-cy=transcript]").should("have.text", "i am aaron");
+          cy.get("[data-cy=transcript]").should(
+            "have.text",
+            "I'm 37 years old"
+          );
         });
       });
     });
diff --git a/cypress/cypress/e2e/record.cy.ts b/cypress/cypress/e2e/record.cy.ts
index 285ba42b..928816ee 100644
--- a/cypress/cypress/e2e/record.cy.ts
+++ b/cypress/cypress/e2e/record.cy.ts
@@ -9,6 +9,7 @@ import {
   mockGQL,
   cyAttachUpload,
   cyMockUpload,
+  cySetup,
 } from "../support/functions";
 import {
   Mentor,
@@ -29,6 +30,7 @@ import {
 } from "../support/helpers";
 import clintMarkdown from "../fixtures/mentor/clint_markdown";
 import {
+  mentorConfig,
   videoMentor,
   videoQuestions,
 } from "../fixtures/recording/video_mentors";
@@ -1327,6 +1329,139 @@ describe("Record", () => {
     });
   });
 
+  describe("mentors with configs", () => {
+    it("shows mentor config intro recording text if set", () => {
+      cyMockDefault(cy, {
+        mentor: {
+          ...videoMentor,
+          mentorConfig: {
+            ...mentorConfig,
+            introRecordingText: "Custom intro recording text",
+          },
+        },
+        questions: videoQuestions.map((q) => {
+          if (q._id === "A2_1_1") {
+            return {
+              ...q,
+              name: UtteranceName.INTRO,
+            };
+          }
+          return q;
+        }),
+        gqlQueries: [
+          mockGQL("UpdateMentorSubjects", {
+            me: { updateMentorSubjects: true },
+          }),
+        ],
+      });
+      cy.visit("/record?videoId=A2_1_1");
+      cy.get("[data-cy=question-text]").should(
+        "contain.text",
+        "Custom intro recording text"
+      );
+    });
+
+    it("does not show mentor config intro recording text if empty", () => {
+      cyMockDefault(cy, {
+        mentor: {
+          ...videoMentor,
+          mentorConfig: {
+            ...mentorConfig,
+            introRecordingText: "",
+          },
+        },
+        questions: videoQuestions.map((q) => {
+          if (q._id === "A2_1_1") {
+            return {
+              ...q,
+              name: UtteranceName.INTRO,
+            };
+          }
+          return q;
+        }),
+        gqlQueries: [
+          mockGQL("UpdateMentorSubjects", {
+            me: { updateMentorSubjects: true },
+          }),
+        ],
+      });
+      cy.visit("/record?videoId=A2_1_1");
+      cy.get("[data-cy=question-text]").should(
+        "not.contain.text",
+        "Custom intro recording text"
+      );
+      cy.get("[data-cy=question-text]").should(
+        "contain.text",
+        "How old are you now?"
+      );
+    });
+
+    it("idle recording duration defaults to config if provided", () => {
+      cyMockDefault(cy, {
+        mentor: {
+          ...videoMentor,
+          mentorConfig: {
+            ...mentorConfig,
+            idleRecordingDuration: 60,
+          },
+        },
+        questions: videoQuestions.map((q) => {
+          if (q._id === "A2_1_1") {
+            return {
+              ...q,
+              name: UtteranceName.IDLE,
+            };
+          }
+          return q;
+        }),
+        gqlQueries: [
+          mockGQL("UpdateMentorSubjects", {
+            me: { updateMentorSubjects: true },
+          }),
+        ],
+      });
+      cy.visit("/record?videoId=A2_1_1");
+      cy.get("[data-cy=question-text]").should(
+        "contain.text",
+        "How old are you now?"
+      );
+      cy.get("[data-cy=idle-duration]").should("contain.text", "60 seconds");
+    });
+
+    it("idle recording duration defaults to question level minVideoLength if no config provided", () => {
+      cyMockDefault(cy, {
+        mentor: {
+          ...videoMentor,
+          mentorConfig: {
+            ...mentorConfig,
+            idleRecordingDuration: 0,
+          },
+        },
+        questions: videoQuestions.map((q) => {
+          if (q._id === "A2_1_1") {
+            return {
+              ...q,
+              name: UtteranceName.IDLE,
+              minVideoLength: 30,
+            };
+          }
+          return q;
+        }),
+        gqlQueries: [
+          mockGQL("UpdateMentorSubjects", {
+            me: { updateMentorSubjects: true },
+          }),
+        ],
+      });
+      cy.visit("/record?videoId=A2_1_1");
+      cy.get("[data-cy=question-text]").should(
+        "contain.text",
+        "How old are you now?"
+      );
+      cy.get("[data-cy=idle-duration]").should("contain.text", "30 seconds");
+    });
+  });
+
   it("When an upload finishes on record view, should swap user to video view", () => {
     cyMockDefault(cy, {
       mentor: [videoMentor],
diff --git a/cypress/cypress/fixtures/recording/video_mentors.ts b/cypress/cypress/fixtures/recording/video_mentors.ts
index 4b3697c6..15022eb6 100644
--- a/cypress/cypress/fixtures/recording/video_mentors.ts
+++ b/cypress/cypress/fixtures/recording/video_mentors.ts
@@ -205,12 +205,15 @@ export const mentorConfig: MentorConfig = {
   subjects: ["fakesubject"],
   publiclyVisible: true,
   mentorType: MentorType.VIDEO,
+  idleRecordingDuration: 10,
+  introRecordingText: "",
   orgPermissions: [],
   loginHeaderText: "test login header text",
   welcomeSlideHeader: "test welcome slide header text",
   welcomeSlideText: "test welcome slide body text",
   disableMyGoalSlide: true,
   disableFollowups: true,
+  lockedToSubjects: false,
 };
 export const videoMentorWithConfig: Mentor = {
   ...videoMentor,
diff --git a/cypress/cypress/support/types.ts b/cypress/cypress/support/types.ts
index 9aa057e9..ead280b8 100644
--- a/cypress/cypress/support/types.ts
+++ b/cypress/cypress/support/types.ts
@@ -102,6 +102,8 @@ export interface MentorConfig {
   lockedToSubjects: boolean;
   publiclyVisible: boolean;
   mentorType: MentorType;
+  idleRecordingDuration: number;
+  introRecordingText: string;
   orgPermissions: OrgPermissionsGQL[];
   loginHeaderText: string;
   welcomeSlideHeader: string;