diff --git a/client/src/views/ContentCreator/ContentCreator.jsx b/client/src/views/ContentCreator/ContentCreator.jsx
index 1473fe09..1e547b83 100644
--- a/client/src/views/ContentCreator/ContentCreator.jsx
+++ b/client/src/views/ContentCreator/ContentCreator.jsx
@@ -32,6 +32,9 @@ export default function ContentCreator() {
       //console.log("Role: ", value);
       if (value.name == 'Researcher') {
         navigate('/report');
+      }
+      else if (value.name == 'Classroom Manager') {
+        navigate('/dashboard')
       };
     }); 
 
diff --git a/client/src/views/Mentor/Dashboard/AddMentor.jsx b/client/src/views/Mentor/Dashboard/AddMentor.jsx
index 84b57304..71b1c231 100644
--- a/client/src/views/Mentor/Dashboard/AddMentor.jsx
+++ b/client/src/views/Mentor/Dashboard/AddMentor.jsx
@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import NavBar from '../../../components/NavBar/NavBar';
 import { getMentor, getSchoolList, addMentorClass } from '../../../Utils/requests';
 import '../../TeacherLogin/TeacherLogin.less';
+import { confirmRedirect } from '../../../App';
 
 //import { findSuperAdmins } from '../../../../server/extensions/users-permissions/controllers/Auth';
 
@@ -21,6 +22,7 @@ const useFormInput = (initialValue) => {
 };
 
 export default function AddMentor() {
+  confirmRedirect();
   const username = useFormInput('');
   const email = useFormInput('');
   const [school, setSchool] = useState("");
diff --git a/client/src/views/Mentor/Dashboard/MentorRegister.jsx b/client/src/views/Mentor/Dashboard/MentorRegister.jsx
index 79d37cd5..cfd7673d 100644
--- a/client/src/views/Mentor/Dashboard/MentorRegister.jsx
+++ b/client/src/views/Mentor/Dashboard/MentorRegister.jsx
@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import NavBar from '../../../components/NavBar/NavBar';
 import { createMentor, getSchoolList } from '../../../Utils/requests';
 import '../../TeacherLogin/TeacherLogin.less';
+import { confirmRedirect } from '../../../App';
 
 //import { findSuperAdmins } from '../../../../server/extensions/users-permissions/controllers/Auth';
 
@@ -34,6 +35,7 @@ const useFormInput = (initialValue) => {
 };
 
 export default function MentorRegister() {
+  confirmRedirect();
   const username = useFormInput('');
   const email = useFormInput('');
   const [school, setSchool] = useState("");
diff --git a/server/extensions/documentation/documentation/1.0.0/full_documentation.json b/server/extensions/documentation/documentation/1.0.0/full_documentation.json
index d17dd260..7bc9a449 100755
--- a/server/extensions/documentation/documentation/1.0.0/full_documentation.json
+++ b/server/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "03/05/2024 3:46:17 PM"
+    "x-generation-date": "03/06/2024 4:13:32 PM"
   },
   "x-strapi-config": {
     "path": "/documentation",