diff --git a/front/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx b/front/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx
index ee63e047..2be18fae 100644
--- a/front/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx
+++ b/front/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx
@@ -22,7 +22,7 @@ export async function generateMetadata(
   const access_token_cookie: any = cookieStore.get('access_token_cookie');
 
   // Get Org context information 
-  const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 360, tags: ['courses'] }, access_token_cookie.value)
+  const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 0, tags: ['courses'] }, access_token_cookie ? access_token_cookie.value : null)
 
   return {
     title: `Edit - ${course_meta.course.name} Activity`,
@@ -37,8 +37,8 @@ const EditActivity = async (params: any) => {
   const courseid = params.params.courseid;
   const orgslug = params.params.orgslug;
 
-  const courseInfo = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 0, tags: ['courses'] }, access_token_cookie.value)
-  const activity = await getActivityWithAuthHeader(activityid, { revalidate: 0, tags: ['activities'] }, access_token_cookie.value)
+  const courseInfo = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 0, tags: ['courses'] }, access_token_cookie ? access_token_cookie.value : null)
+  const activity = await getActivityWithAuthHeader(activityid, { revalidate: 0, tags: ['activities'] }, access_token_cookie ? access_token_cookie.value : null)
 
 
   return (
diff --git a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/page.tsx b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/page.tsx
index 8f2c4c55..140a0f1a 100644
--- a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/page.tsx
+++ b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/page.tsx
@@ -19,8 +19,8 @@ export async function generateMetadata(
 
     // Get Org context information 
     const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
-    const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 360, tags: ['courses'] }, access_token_cookie.value)
-    const activity = await getActivityWithAuthHeader(params.activityid, { revalidate: 0, tags: ['activities'] }, access_token_cookie.value)
+    const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 0, tags: ['courses'] }, access_token_cookie ? access_token_cookie.value : null )
+    const activity = await getActivityWithAuthHeader(params.activityid, { revalidate: 0, tags: ['activities'] }, access_token_cookie ? access_token_cookie.value : null)
 
     return {
         title: activity.name + ` — ${course_meta.course.name} Course`,
@@ -35,8 +35,8 @@ const ActivityPage = async (params: any) => {
     const courseid = params.params.courseid;
     const orgslug = params.params.orgslug;
 
-    const course_meta = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 0, tags: ['courses'] }, access_token_cookie.value)
-    const activity = await getActivityWithAuthHeader(activityid, { revalidate: 0, tags: ['activities'] }, access_token_cookie.value)
+    const course_meta = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 0, tags: ['courses'] }, access_token_cookie ? access_token_cookie.value : null)
+    const activity = await getActivityWithAuthHeader(activityid, { revalidate: 0, tags: ['activities'] }, access_token_cookie ? access_token_cookie.value : null)
     return (
         <>
             <ActivityClient
diff --git a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx
index 3617db18..e5494c84 100644
--- a/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx
+++ b/front/app/orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx
@@ -18,7 +18,7 @@ export async function generateMetadata(
 
     // Get Org context information 
     const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
-    const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 360, tags: ['courses'] }, access_token_cookie.value)
+    const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 0, tags: ['courses'] }, access_token_cookie ? access_token_cookie.value : null)
 
     return {
         title: course_meta.course.name + ` — ${org.name}`,
@@ -33,7 +33,8 @@ const CoursePage = async (params: any) => {
     const access_token_cookie: any = cookieStore.get('access_token_cookie');
     const courseid = params.params.courseid
     const orgslug = params.params.orgslug;
-    const course_meta = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 360, tags: ['courses'] }, access_token_cookie.value)
+    const course_meta = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 0, tags: ['courses'] }, access_token_cookie ? access_token_cookie.value : null)
+    
     return (
         <div>
             <CourseClient courseid={courseid} orgslug={orgslug} course={course_meta} />
diff --git a/front/app/orgs/[orgslug]/(withmenu)/page.tsx b/front/app/orgs/[orgslug]/(withmenu)/page.tsx
index 90796503..4c5def42 100644
--- a/front/app/orgs/[orgslug]/(withmenu)/page.tsx
+++ b/front/app/orgs/[orgslug]/(withmenu)/page.tsx
@@ -34,8 +34,8 @@ const OrgHomePage = async (params: any) => {
   const cookieStore = cookies();
   const access_token_cookie: any = cookieStore.get('access_token_cookie');
 
-  const courses = await getOrgCoursesWithAuthHeader(orgslug, { revalidate: 360, tags: ['courses'] }, access_token_cookie.value);
-  const collections = await getOrgCollectionsWithAuthHeader(access_token_cookie.value);
+  const courses = await getOrgCoursesWithAuthHeader(orgslug, { revalidate: 0, tags: ['courses'] }, access_token_cookie ? access_token_cookie.value : null);
+  const collections = await getOrgCollectionsWithAuthHeader(access_token_cookie ? access_token_cookie.value : null);
 
 
   // function to remove "course_" from the course_id
diff --git a/front/services/utils/ts/requests.ts b/front/services/utils/ts/requests.ts
index 4400c59c..06c88816 100644
--- a/front/services/utils/ts/requests.ts
+++ b/front/services/utils/ts/requests.ts
@@ -19,7 +19,7 @@ export const RequestBody = (method: string, data: any, next: any) => {
 };
 
 export const RequestBodyWithAuthHeader = (method: string, data: any, next: any, token: string) => {
-  let HeadersConfig = new Headers({ Authorization: `Bearer ${token}` });
+  let HeadersConfig = new Headers(token ? { "Content-Type": "application/json", Authorization: `Bearer ${token}` } : { "Content-Type": "application/json" });
   let options: any = {
     method: method,
     headers: HeadersConfig,