diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 6a9d4d5b8..e7dfc8dc5 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -8,10 +8,12 @@
 <script setup>
 import { Toasts } from 'frappe-ui'
 import { Dialogs } from '@/utils/dialogs'
-import { computed, defineAsyncComponent } from 'vue'
+import { computed, onMounted, onUnmounted } from 'vue'
 import { useScreenSize } from './utils/composables'
 import DesktopLayout from './components/DesktopLayout.vue'
 import MobileLayout from './components/MobileLayout.vue'
+import { stopSession } from '@/telemetry'
+import { init as initTelemetry } from '@/telemetry'
 
 const screenSize = useScreenSize()
 
@@ -22,4 +24,12 @@ const Layout = computed(() => {
 		return DesktopLayout
 	}
 })
+
+onMounted(async () => {
+	await initTelemetry()
+})
+
+onUnmounted(() => {
+	stopSession()
+})
 </script>
diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue
index 2eb225c22..670548a41 100644
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -81,7 +81,7 @@
 		<router-link
 			v-if="isModerator"
 			:to="{
-				name: 'BatchCreation',
+				name: 'BatchForm',
 				params: {
 					batchName: batch.data.name,
 				},
diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index f7730380d..c5f6f63f4 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -77,7 +77,6 @@ const valuePropPassed = computed(() => 'value' in attrs)
 const value = computed({
 	get: () => (valuePropPassed.value ? attrs.value : props.modelValue),
 	set: (val) => {
-		console.log(valuePropPassed.value)
 		return (
 			val?.value &&
 			emit(valuePropPassed.value ? 'change' : 'update:modelValue', val?.value)
diff --git a/frontend/src/components/CourseCardOverlay.vue b/frontend/src/components/CourseCardOverlay.vue
index 83a00ac61..3b8aa1702 100644
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -75,7 +75,7 @@
 			<router-link
 				v-if="user?.data?.is_moderator || is_instructor()"
 				:to="{
-					name: 'CreateCourse',
+					name: 'CourseForm',
 					params: {
 						courseName: course.data.name,
 					},
diff --git a/frontend/src/components/LessonPlugins.vue b/frontend/src/components/LessonPlugins.vue
index 89af799db..1f60776eb 100644
--- a/frontend/src/components/LessonPlugins.vue
+++ b/frontend/src/components/LessonPlugins.vue
@@ -124,8 +124,6 @@ const props = defineProps({
 })
 
 const addQuiz = (value) => {
-	console.log('here')
-	console.log(value)
 	getCurrentEditor().caret.setToLastBlock('end', 0)
 	if (value) {
 		getCurrentEditor().blocks.insert('quiz', {
diff --git a/frontend/src/components/Modals/ChapterModal.vue b/frontend/src/components/Modals/ChapterModal.vue
index 59794507c..b524d5139 100644
--- a/frontend/src/components/Modals/ChapterModal.vue
+++ b/frontend/src/components/Modals/ChapterModal.vue
@@ -23,6 +23,7 @@
 import { Dialog, FormControl, createResource } from 'frappe-ui'
 import { defineModel, reactive, watch } from 'vue'
 import { createToast } from '@/utils/'
+import { capture } from '@/telemetry'
 
 const show = defineModel()
 const outline = defineModel('outline')
@@ -91,6 +92,7 @@ const addChapter = (close) => {
 				}
 			},
 			onSuccess: (data) => {
+				capture('chapter_created')
 				chapterReference.submit(
 					{ name: data.name },
 					{
diff --git a/frontend/src/main.js b/frontend/src/main.js
index d26c11d33..72dce29aa 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -6,7 +6,6 @@ import App from './App.vue'
 import { createPinia } from 'pinia'
 import dayjs from '@/utils/dayjs'
 import translationPlugin from './translation'
-import posthog from './posthog'
 import { usersStore } from './stores/user'
 import { sessionStore } from './stores/session'
 import { initSocket } from './socket'
@@ -26,7 +25,6 @@ app.use(FrappeUI)
 app.use(pinia)
 app.use(router)
 app.use(translationPlugin)
-app.use(posthog)
 app.use(pageMetaPlugin)
 app.provide('$dayjs', dayjs)
 app.provide('$socket', initSocket())
diff --git a/frontend/src/pages/BatchCreation.vue b/frontend/src/pages/BatchForm.vue
similarity index 98%
rename from frontend/src/pages/BatchCreation.vue
rename to frontend/src/pages/BatchForm.vue
index 2ac16ac9d..74a9101ad 100644
--- a/frontend/src/pages/BatchCreation.vue
+++ b/frontend/src/pages/BatchForm.vue
@@ -236,6 +236,7 @@ import MultiSelect from '@/components/Controls/MultiSelect.vue'
 import { useRouter } from 'vue-router'
 import { getFileSize, showToast } from '../utils'
 import { X, FileText } from 'lucide-vue-next'
+import { capture } from "@/telemetry"
 
 const router = useRouter()
 const user = inject('$user')
@@ -274,6 +275,8 @@ onMounted(() => {
 	if (!user.data) window.location.href = '/login'
 	if (props.batchName != 'new') {
 		batchDetail.reload()
+	} else {
+		capture("batch_form_opened")
 	}
 	window.addEventListener('keydown', keyboardShortcut)
 })
@@ -377,6 +380,7 @@ const createNewBatch = () => {
 		{},
 		{
 			onSuccess(data) {
+				capture("batch_created")
 				router.push({
 					name: 'BatchDetail',
 					params: {
@@ -447,7 +451,7 @@ const breadcrumbs = computed(() => {
 	}
 	crumbs.push({
 		label: props.batchName == 'new' ? 'New Batch' : 'Edit Batch',
-		route: { name: 'BatchCreation', params: { batchName: props.batchName } },
+		route: { name: 'BatchForm', params: { batchName: props.batchName } },
 	})
 	return crumbs
 })
diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue
index 2ace50f69..77e73c5d4 100644
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches.vue
@@ -19,7 +19,7 @@
 				<router-link
 					v-if="user.data?.is_moderator"
 					:to="{
-						name: 'BatchCreation',
+						name: 'BatchForm',
 						params: { batchName: 'new' },
 					}"
 				>
diff --git a/frontend/src/pages/CreateCourse.vue b/frontend/src/pages/CourseForm.vue
similarity index 98%
rename from frontend/src/pages/CreateCourse.vue
rename to frontend/src/pages/CourseForm.vue
index dbd33dda1..4e92db901 100644
--- a/frontend/src/pages/CreateCourse.vue
+++ b/frontend/src/pages/CourseForm.vue
@@ -227,6 +227,7 @@ import { FileText, X } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import CourseOutline from '@/components/CourseOutline.vue'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
+import { capture } from "@/telemetry";
 
 const user = inject('$user')
 const newTag = ref('')
@@ -268,6 +269,8 @@ onMounted(() => {
 
 	if (props.courseName !== 'new') {
 		courseResource.reload()
+	} else {
+		capture("course_form_opened")
 	}
 	window.addEventListener('keydown', keyboardShortcut)
 })
@@ -388,9 +391,10 @@ const submitCourse = () => {
 	} else {
 		courseCreationResource.submit(course, {
 			onSuccess(data) {
+				capture("course_created")
 				showToast('Success', 'Course created successfully', 'check')
 				router.push({
-					name: 'CreateCourse',
+					name: 'CourseForm',
 					params: { courseName: data.name },
 				})
 			},
@@ -489,7 +493,7 @@ const breadcrumbs = computed(() => {
 	}
 	crumbs.push({
 		label: props.courseName == 'new' ? 'New Course' : 'Edit Course',
-		route: { name: 'CreateCourse', params: { courseName: props.courseName } },
+		route: { name: 'CourseForm', params: { courseName: props.courseName } },
 	})
 	return crumbs
 })
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index c367d1512..299cf4345 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -22,7 +22,7 @@
 				</div>
 				<router-link
 					:to="{
-						name: 'CreateCourse',
+						name: 'CourseForm',
 						params: {
 							courseName: 'new',
 						},
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index f112d2e5f..5cda0ab0c 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -82,6 +82,7 @@ import EditorJS from '@editorjs/editorjs'
 import LessonPlugins from '@/components/LessonPlugins.vue'
 import { ChevronRight } from 'lucide-vue-next'
 import { updateDocumentTitle, createToast, getEditorTools } from '@/utils'
+import { capture } from '@/telemetry'
 
 const editor = ref(null)
 const instructorEditor = ref(null)
@@ -108,6 +109,7 @@ onMounted(() => {
 	if (!user.data?.is_moderator && !user.data?.is_instructor) {
 		window.location.href = '/login'
 	}
+	capture('lesson_form_opened')
 	editor.value = renderEditor('content')
 	instructorEditor.value = renderEditor('instructor-notes')
 })
@@ -360,6 +362,7 @@ const createNewLesson = () => {
 					{ lesson: data.name },
 					{
 						onSuccess() {
+							capture('lesson_created')
 							showToast('Success', 'Lesson created successfully', 'check')
 							lessonDetails.reload()
 						},
diff --git a/frontend/src/posthog.js b/frontend/src/posthog.js
deleted file mode 100644
index f3c5bdb86..000000000
--- a/frontend/src/posthog.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import posthog from "posthog-js";
-import { createResource } from 'frappe-ui'
-
-const apiInfo = createResource({
-    url: 'lms.lms.api.get_posthog_api_key',
-    cache: 'apiInfo',
-    auto: true,
-    onSuccess(data) {
-        return data
-    },
-})
-
-
-export default {
-    install(app) {
-        app.config.globalProperties.$posthog = posthog.init(apiInfo.data.project_id, {
-            api_host: apiInfo.data.posthog_host,
-            autocapture: false,
-            capture_pageview: false,
-            capture_pageleave: false,
-            advanced_disable_decide: apiInfo.data.should_record_session,
-        });
-    },
-};
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 46b830b4e..8909be567 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -97,8 +97,8 @@ const routes = [
 	},
 	{
 		path: '/courses/:courseName/edit',
-		name: 'CreateCourse',
-		component: () => import('@/pages/CreateCourse.vue'),
+		name: 'CourseForm',
+		component: () => import('@/pages/CourseForm.vue'),
 		props: true,
 	},
 	{
@@ -109,8 +109,8 @@ const routes = [
 	},
 	{
 		path: '/batches/:batchName/edit',
-		name: 'BatchCreation',
-		component: () => import('@/pages/BatchCreation.vue'),
+		name: 'BatchForm',
+		component: () => import('@/pages/BatchForm.vue'),
 		props: true,
 	},
 	{
diff --git a/frontend/src/telemetry.ts b/frontend/src/telemetry.ts
new file mode 100644
index 000000000..dfd5e3b6a
--- /dev/null
+++ b/frontend/src/telemetry.ts
@@ -0,0 +1,98 @@
+import { useStorage } from "@vueuse/core";
+import { call } from "frappe-ui";
+import "../../../frappe/frappe/public/js/lib/posthog.js";
+
+const APP = "lms";
+const SITENAME = window.location.hostname;
+
+declare global {
+  interface Window {
+    posthog: any;
+  }
+}
+
+const telemetry = useStorage("telemetry", {
+  enabled: false,
+  project_id: "",
+  host: "",
+});
+
+export async function init() {
+  await set_enabled();
+  if (!telemetry.value.enabled) return;
+  try {
+    await set_credentials();
+    window.posthog.init(telemetry.value.project_id, {
+      api_host: telemetry.value.host,
+      autocapture: false,
+      person_profiles: "always",
+      capture_pageview: true,
+      capture_pageleave: true,
+      disable_session_recording: false,
+      session_recording: {
+        maskAllInputs: false,
+        maskInputOptions: {
+          password: true,
+        },
+      },
+      loaded: (posthog) => {
+        window.posthog = posthog;
+        window.posthog.identify(SITENAME);
+      },
+    });
+  } catch (e) {
+    console.trace("Failed to initialize telemetry", e);
+    telemetry.value.enabled = false;
+  }
+}
+
+async function set_enabled() {
+  if (telemetry.value.enabled) return;
+
+  await call("lms.lms.telemetry.is_enabled").then((res) => {
+    telemetry.value.enabled = res;
+  });
+}
+
+async function set_credentials() {
+  if (!telemetry.value.enabled) return;
+  if (telemetry.value.project_id && telemetry.value.host) return;
+
+  await call("lms.lms.telemetry.get_credentials").then((res) => {
+    telemetry.value.project_id = res.project_id;
+    telemetry.value.host = res.telemetry_host;
+  });
+}
+
+interface CaptureOptions {
+  data: {
+    user: string;
+    [key: string]: string | number | boolean | object;
+  };
+}
+
+export function capture(
+  event: string,
+  options: CaptureOptions = { data: { user: "" } }
+) {
+  if (!telemetry.value.enabled) return;
+  window.posthog.capture(`${APP}_${event}`, options);
+}
+
+export function recordSession() {
+  if (!telemetry.value.enabled) return;
+  if (window.posthog && window.posthog.__loaded) {
+    window.posthog.startSessionRecording();
+  }
+}
+
+export function stopSession() {
+  if (!telemetry.value.enabled) return;
+  if (
+    window.posthog &&
+    window.posthog.__loaded &&
+    window.posthog.sessionRecordingStarted()
+  ) {
+    window.posthog.stopSessionRecording();
+  }
+}
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index e732e09f2..2123d981d 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -424,7 +424,7 @@ export function getSidebarLinks() {
 				'Courses',
 				'CourseDetail',
 				'Lesson',
-				'CreateCourse',
+				'CourseForm',
 				'LessonForm',
 			],
 		},
@@ -432,7 +432,7 @@ export function getSidebarLinks() {
 			label: 'Batches',
 			icon: 'Users',
 			to: 'Batches',
-			activeFor: ['Batches', 'BatchDetail', 'Batch', 'BatchCreation'],
+			activeFor: ['Batches', 'BatchDetail', 'Batch', 'BatchForm'],
 		},
 		{
 			label: 'Certified Participants',
diff --git a/lms/lms/api.py b/lms/lms/api.py
index a27557e75..c25e49da2 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -560,23 +560,3 @@ def get_categories(doctype, filters):
 			categoryOptions.append({"label": category, "value": category})
 
 	return categoryOptions
-
-@frappe.whitelist(allow_guest=True)
-def get_posthog_api_key():
-	should_record_session
-	return {
-		"project_id": frappe.conf.get(POSTHOG_PROJECT_FIELD),
-		"posthog_host": frappe.conf.get(POSTHOG_HOST_FIELD),
-		"enable_telemetry": frappe.get_system_settings("enable_telemetry"),
-		"should_record_session": should_record_session(),
-	}
-
-def should_record_session():
-	start_datetime = frappe.boot.sysdefaults.session_recording_start
-	start_datetime = get_datetime(start_datetime)
-	if not start_datetime:
-		return False
-	
-	now = now_datetime()
-	# if user allowed recording only record for first 2 hours, never again.
-	return time_diff(now, start_datetime) < 120;
\ No newline at end of file
diff --git a/lms/lms/telemetry.py b/lms/lms/telemetry.py
new file mode 100644
index 000000000..c704351f3
--- /dev/null
+++ b/lms/lms/telemetry.py
@@ -0,0 +1,16 @@
+import frappe
+
+@frappe.whitelist()
+def is_enabled():
+    return bool(
+        frappe.get_system_settings("enable_telemetry")
+        and frappe.conf.get("posthog_host")
+        and frappe.conf.get("posthog_project_id")
+    )
+
+@frappe.whitelist()
+def get_credentials():
+    return {
+        "project_id": frappe.conf.get("posthog_project_id"),
+        "telemetry_host": frappe.conf.get("posthog_host"),
+    }
diff --git a/package.json b/package.json
index 3d55b554e..f5231fac1 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
     "cypress-file-upload": "^5.0.8"
   },
   "dependencies": {
-    "posthog-js": "^1.154.4",
     "pre-commit": "^1.2.2"
   }
 }