diff --git a/client/src/components/home/index.tsx b/client/src/components/home/index.tsx
index 055b59cb..26654a57 100644
--- a/client/src/components/home/index.tsx
+++ b/client/src/components/home/index.tsx
@@ -35,7 +35,7 @@ import parseMentor, {
   defaultMentorInfo,
 } from "components/my-mentor-card/mentor-info";
 import NavBar from "components/nav-bar";
-import { canEditContent, launchMentor } from "helpers";
+import { canEditContent, isAdmin, launchMentor } from "helpers";
 import {
   QuestionEdits,
   useWithReviewAnswerState,
@@ -57,6 +57,7 @@ import { trainMentor } from "api";
 import { useWithConfig } from "store/slices/config/useWithConfig";
 import { BuildMentorTooltip } from "./build-mentor-tooltip";
 import { MentorConfig } from "types-gql";
+import { useAppSelector } from "store/hooks";
 
 const useStyles = makeStyles({ name: { HomePage } })((theme: Theme) => ({
   toolbar: {
@@ -155,7 +156,9 @@ function HomePage(props: {
   const mentorConfig: MentorConfig | undefined = getData(
     (m) => m.data?.mentorConfig
   );
-  const lockedToConfig: boolean = getData((m) => m.data?.lockedToConfig);
+  const user = useAppSelector((state) => state.login.user);
+  const lockedToConfig: boolean =
+    !isAdmin(user) && getData((m) => m.data?.lockedToConfig);
   const defaultMentor = props.user.defaultMentor._id;
   const { classes } = useStyles();
   const [showSetupAlert, setShowSetupAlert] = useState(true);
@@ -532,7 +535,7 @@ function HomePage(props: {
                 {name}
               </MenuItem>
             ))}
-            {mentorConfig?.lockedToSubjects ? undefined : (
+            {lockedToConfig && mentorConfig?.lockedToSubjects ? undefined : (
               <MenuItem
                 key={"add-subject"}
                 data-cy={"add-subject"}
diff --git a/client/src/components/nav-bar.tsx b/client/src/components/nav-bar.tsx
index 80150c6d..726ea1f3 100644
--- a/client/src/components/nav-bar.tsx
+++ b/client/src/components/nav-bar.tsx
@@ -47,13 +47,14 @@ import { useWithLogin } from "store/slices/login/useWithLogin";
 import useActiveMentor from "store/slices/mentor/useActiveMentor";
 import withLocation from "wrap-with-location";
 import { Mentor, UploadTask } from "types";
-import { canEditContent, launchMentor } from "helpers";
+import { canEditContent, isAdmin, launchMentor } from "helpers";
 import {
   areAllTasksDone,
   isATaskCancelled,
 } from "hooks/graphql/upload-status-helpers";
 import { useWithImportStatus } from "hooks/graphql/use-with-import-status";
 import ImportInProgressDialog from "./import-export/import-in-progress";
+import { useAppSelector } from "store/hooks";
 
 const useStyles = makeStyles({ name: { Login } })((theme: Theme) => ({
   toolbar: {
@@ -320,7 +321,8 @@ export function NavBar(props: {
   } = props;
   const { getData } = useActiveMentor();
   const mentor: Mentor | undefined = getData((state) => state.data);
-
+  const user = useAppSelector((state) => state.login.user);
+  const lockedToConfig = mentor?.lockedToConfig && !isAdmin(user);
   const importStatus = useWithImportStatus();
   const { importTask } = importStatus;
   const numUploadsInProgress =
@@ -403,7 +405,9 @@ export function NavBar(props: {
       >
         <Toolbar />
         <NavMenu
-          mentorSubjectsLocked={Boolean(mentor?.mentorConfig?.lockedToSubjects)}
+          mentorSubjectsLocked={Boolean(
+            lockedToConfig && mentor?.mentorConfig?.lockedToSubjects
+          )}
           classes={classes}
           mentorId={props.mentorId}
           onNav={onNav}
diff --git a/client/src/helpers.ts b/client/src/helpers.ts
index 5c62c0dc..6c901acd 100644
--- a/client/src/helpers.ts
+++ b/client/src/helpers.ts
@@ -496,3 +496,9 @@ export function isDateWithinLastMonth(date: string): boolean {
   const diffDays = Math.ceil(diff / (1000 * 3600 * 24));
   return diffDays < 30;
 }
+
+export function isAdmin(user?: User): boolean {
+  return (
+    user?.userRole === UserRole.ADMIN || user?.userRole === UserRole.SUPER_ADMIN
+  );
+}
diff --git a/client/src/hooks/graphql/use-with-setup.tsx b/client/src/hooks/graphql/use-with-setup.tsx
index 9c0f5f12..c1b2acbe 100644
--- a/client/src/hooks/graphql/use-with-setup.tsx
+++ b/client/src/hooks/graphql/use-with-setup.tsx
@@ -16,7 +16,12 @@ import {
 } from "types";
 import { LoadingError } from "./loading-reducer";
 import { useWithConfig } from "store/slices/config/useWithConfig";
-import { getValueIfKeyExists, isAnswerComplete, urlBuild } from "helpers";
+import {
+  getValueIfKeyExists,
+  isAdmin,
+  isAnswerComplete,
+  urlBuild,
+} from "helpers";
 import { useMentorEdits } from "store/slices/mentor/useMentorEdits";
 import useActiveMentor from "store/slices/mentor/useActiveMentor";
 import useQuestions from "store/slices/questions/useQuestions";
@@ -194,11 +199,17 @@ export function useWithSetup(
       requiredSubjects,
       isSetupComplete,
     });
-    const mentorSubjectsLocked = mentor.mentorConfig?.lockedToSubjects;
+    const user = useAppSelector((state) => state.login.user);
+    const lockedToConfig = !isAdmin(user) && mentor.lockedToConfig;
+    const mentorSubjectsLocked =
+      lockedToConfig && mentor.mentorConfig?.lockedToSubjects;
     const mentorPrivacyLocked =
-      mentor.mentorConfig?.publiclyVisible !== undefined ||
-      mentor.mentorConfig?.orgPermissions.length;
-    const mentorTypeLocked = mentor.mentorConfig?.mentorType;
+      lockedToConfig &&
+      (mentor.mentorConfig?.publiclyVisible !== undefined ||
+        mentor.mentorConfig?.orgPermissions.length);
+    const mentorTypeLocked = lockedToConfig && mentor.mentorConfig?.mentorType;
+    const disabledMyGoalSlide =
+      lockedToConfig && mentor.mentorConfig?.disableMyGoalSlide;
     const status: SetupStep[] = [
       { type: SetupStepType.WELCOME, complete: true },
       { type: SetupStepType.MENTOR_INFO, complete: isMentorInfoDone },
@@ -208,7 +219,7 @@ export function useWithSetup(
       ...(mentorPrivacyLocked
         ? []
         : [{ type: SetupStepType.MENTOR_PRIVACY, complete: true }]),
-      ...(mentor.mentorConfig?.disableMyGoalSlide
+      ...(disabledMyGoalSlide
         ? []
         : [
             { type: SetupStepType.MENTOR_GOAL, complete: Boolean(mentor.goal) },