diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9ab25d6..a0b8f7a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - main
+      - develop
+      - main-hotfix
   pull_request: {}
 jobs:
   tests:
diff --git a/.github/workflows/make_release_pr.yml b/.github/workflows/make_release_pr.yml
index 4c0890c1..9a4528b9 100644
--- a/.github/workflows/make_release_pr.yml
+++ b/.github/workflows/make_release_pr.yml
@@ -18,9 +18,9 @@ jobs:
           owner: frappe
           repo: lms
           title: |-
-            "chore: merge 'develop' into 'main'"
+            "chore: merge 'main-hotfix' into 'main'"
           body: "Automated weekly release"
           base: main
-          head: develop
+          head: main-hotfix
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index e053c9b8..111c5918 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -4,7 +4,10 @@ on:
   pull_request:
   workflow_dispatch:
   push:
-    branches: [ main ]
+    branches: 
+      - main
+      - develop
+      - main-hotfix
 
 permissions:
   # Do not change this as GITHUB_TOKEN is being used by roulette
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 00000000..098cfd0a
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,30 @@
+pull_request_rules:
+    - name: backport to develop
+      conditions:
+          - label="backport develop"
+      actions:
+          backport:
+              branches:
+                  - develop
+              assignees:
+                  - "{{ author }}"
+
+    - name: backport to main-hotfix
+      conditions:
+          - label="backport main-hotfix"
+      actions:
+          backport:
+              branches:
+                  - main-hotfix
+              assignees:
+                  - "{{ author }}"
+
+    - name: backport to main
+      conditions:
+          - label="backport main"
+      actions:
+          backport:
+              branches:
+                  - main
+              assignees:
+                  - "{{ author }}"
diff --git a/cypress/e2e/batch_creation.cy.js b/cypress/e2e/batch_creation.cy.js
index 4f48bf70..653a70a2 100644
--- a/cypress/e2e/batch_creation.cy.js
+++ b/cypress/e2e/batch_creation.cy.js
@@ -162,8 +162,12 @@ describe("Batch Creation", () => {
 		/* Add student to batch */
 		cy.get("button").contains("Students").click();
 		cy.get("button").contains("Add").click();
-		cy.get('div[role="dialog"]').first().find("button").eq(1).click();
-		cy.get("input[id^='headlessui-combobox-input-v-']").type(randomEmail);
+		cy.get('div[role="dialog"]')
+			.first()
+			.find("input[id^='headlessui-combobox-input-v-']")
+			.first()
+			.click();
+		cy.get("input[placeholder='Search']").type(randomEmail);
 		cy.get("div").contains(randomEmail).click();
 		cy.get("button").contains("Submit").click();
 
diff --git a/cypress/e2e/course_creation.cy.js b/cypress/e2e/course_creation.cy.js
index 47a592d9..de0113fe 100644
--- a/cypress/e2e/course_creation.cy.js
+++ b/cypress/e2e/course_creation.cy.js
@@ -65,7 +65,7 @@ describe("Course Creation", () => {
 			.contains("Category")
 			.parent()
 			.within(() => {
-				cy.get("button").click();
+				cy.get("input").click();
 			});
 		cy.get("[id^=headlessui-combobox-option-")
 			.should("be.visible")
diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue
index 1280794f..79fbd5b7 100644
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -1,142 +1,92 @@
 <template>
 	<div>
+		<!-- Label -->
 		<div v-if="label" class="text-xs text-ink-gray-5 mb-1">
 			{{ __(label) }}
 			<span class="text-ink-red-3" v-if="attrs.required">*</span>
 		</div>
-		<Combobox
-			v-model="selectedValue"
-			nullable
-			v-slot="{ open: isComboboxOpen }"
-		>
-			<Popover class="w-full" v-model:show="showOptions">
-				<template #target="{ open: openPopover, togglePopover }">
-					<slot name="target" v-bind="{ open: openPopover, togglePopover }">
-						<div class="w-full">
-							<button
-								class="flex w-full items-center justify-between focus:outline-none"
-								:class="inputClasses"
-								@click="
-									() => {
-										showOptions = true
-										togglePopover()
-									}
-								"
-								:disabled="attrs.readonly"
+		<Combobox v-model="selectedValue" nullable v-slot="{ open }">
+			<div class="relative w-full">
+				<ComboboxInput
+					class="form-input w-full"
+					:class="inputClasses"
+					type="text"
+					:value="selectedValue"
+					autocomplete="off"
+					@click="onFocus"
+				/>
+				<ComboboxButton ref="trigger" class="hidden" />
+
+				<!-- Dropdown -->
+				<ComboboxOptions
+					class="absolute z-20 mt-1 w-full rounded-lg bg-surface-white py-1 text-base border-2 shadow-lg"
+				>
+					<input
+						ref="search"
+						v-model="query"
+						class="form-input w-[98%] rounded-tl-lg rounded-tr-lg mb-1 mx-1"
+						type="text"
+						placeholder="Search"
+						autocomplete="off"
+					/>
+					<!-- Options -->
+					<div class="my-1 max-h-[12rem] overflow-y-auto px-1.5">
+						<template v-for="group in groups" :key="group.key">
+							<div
+								v-if="group.group && !group.hideLabel"
+								class="px-2.5 py-1.5 text-sm font-medium text-ink-gray-4"
 							>
-								<div class="flex items-center w-[90%]">
-									<slot name="prefix" />
-									<span
-										class="block truncate text-base leading-5"
-										v-if="selectedValue"
-									>
-										{{ displayValue(selectedValue) }}
-									</span>
-									<span class="text-base leading-5 text-ink-gray-4" v-else>
-										{{ placeholder || '' }}
-									</span>
-								</div>
-								<ChevronDown class="h-4 w-4 stroke-1.5" />
-							</button>
-						</div>
-					</slot>
-				</template>
-				<template #body="{ isOpen }">
-					<div v-show="isOpen" class="">
-						<div
-							class="mt-1 rounded-lg bg-surface-white py-1 text-base border-2"
-						>
-							<div class="relative px-1.5 pt-0.5">
-								<ComboboxInput
-									ref="search"
-									class="form-input w-full"
-									type="text"
-									@change="
-										(e) => {
-											query = e.target.value
-										}
-									"
-									:value="query"
-									autocomplete="off"
-									placeholder="Search"
-								/>
-								<button
-									class="absolute right-1.5 inline-flex h-7 w-7 items-center justify-center"
-									@click="selectedValue = null"
-								>
-									<X class="h-4 w-4 stroke-1.5 text-ink-gray-7" />
-								</button>
+								{{ group.group }}
 							</div>
-							<ComboboxOptions
-								class="my-1 max-h-[12rem] overflow-y-auto px-1.5"
-								static
+
+							<ComboboxOption
+								v-for="option in group.items"
+								:key="option.value"
+								:value="option.value"
+								v-slot="{ active }"
 							>
-								<div
-									class="mt-1.5"
-									v-for="group in groups"
-									:key="group.key"
-									v-show="group.items.length > 0"
-								>
-									<div
-										v-if="group.group && !group.hideLabel"
-										class="px-2.5 py-1.5 text-sm font-medium text-ink-gray-4"
-									>
-										{{ group.group }}
-									</div>
-									<ComboboxOption
-										as="template"
-										v-for="option in group.items"
-										:key="option.value"
-										:value="option"
-										v-slot="{ active, selected }"
-									>
-										<li
-											:class="[
-												'flex items-center rounded px-2.5 py-2 text-base',
-												{ 'bg-surface-gray-2': active },
-											]"
-										>
-											<slot
-												name="item-prefix"
-												v-bind="{ active, selected, option }"
-											/>
-											<slot
-												name="item-label"
-												v-bind="{ active, selected, option }"
-											>
-												<div class="flex flex-col gap-1 p-1">
-													<div class="text-base font-medium text-ink-gray-8">
-														{{
-															option.value == option.label
-																? option.description
-																: option.label
-														}}
-													</div>
-													<div class="text-sm text-ink-gray-5">
-														{{ option.value }}
-													</div>
-												</div>
-											</slot>
-										</li>
-									</ComboboxOption>
-								</div>
 								<li
-									v-if="groups.length == 0"
-									class="mt-1.5 rounded-md px-2.5 py-1.5 text-base text-ink-gray-5"
+									:class="[
+										'flex items-center rounded px-2.5 py-2 text-base cursor-pointer',
+										{ 'bg-surface-gray-2': active },
+									]"
 								>
-									No results found
+									<div class="flex flex-col gap-1 p-1">
+										<div class="text-base font-medium text-ink-gray-8">
+											{{
+												option.value === option.label
+													? option.description
+													: option.label
+											}}
+										</div>
+										<div class="text-sm text-ink-gray-5">
+											{{ option.value }}
+										</div>
+									</div>
 								</li>
-							</ComboboxOptions>
-							<div v-if="slots.footer" class="border-t p-1.5 pb-0.5">
-								<slot
-									name="footer"
-									v-bind="{ value: search?.el._value, close }"
-								></slot>
-							</div>
+							</ComboboxOption>
+						</template>
+
+						<div
+							v-if="groups.length === 0"
+							class="mt-1.5 rounded-md px-2.5 py-1.5 text-base text-ink-gray-5"
+						>
+							{{ __('No results found') }}
 						</div>
 					</div>
-				</template>
-			</Popover>
+
+					<!-- Footer -->
+					<div v-if="slots.footer" class="border-t p-1.5 pb-0.5">
+						<slot
+							name="footer"
+							v-bind="{
+								value: selectedValue,
+								close,
+							}"
+						/>
+					</div>
+				</ComboboxOptions>
+			</div>
 		</Combobox>
 	</div>
 </template>
@@ -147,15 +97,16 @@ import {
 	ComboboxInput,
 	ComboboxOptions,
 	ComboboxOption,
+	ComboboxButton,
 } from '@headlessui/vue'
-import { Popover } from 'frappe-ui'
-import { ChevronDown, X } from 'lucide-vue-next'
 import { ref, computed, useAttrs, useSlots, watch, nextTick } from 'vue'
+import { ChevronDown, X } from 'lucide-vue-next'
+import { watchDebounced } from '@vueuse/core'
 
 const props = defineProps({
 	modelValue: {
-		type: String,
-		default: '',
+		type: [String, Object],
+		default: null,
 	},
 	options: {
 		type: Array,
@@ -186,107 +137,93 @@ const props = defineProps({
 		default: true,
 	},
 })
+
 const emit = defineEmits(['update:modelValue', 'update:query', 'change'])
-
-const query = ref('')
-const showOptions = ref(false)
+const trigger = ref(null)
 const search = ref(null)
-
 const attrs = useAttrs()
 const slots = useSlots()
-
+const selectedValue = ref(props.modelValue)
+const query = ref('')
 const valuePropPassed = computed(() => 'value' in attrs)
 
-const selectedValue = computed({
-	get() {
-		return valuePropPassed.value ? attrs.value : props.modelValue
-	},
-	set(val) {
-		query.value = ''
-		if (val) {
-			showOptions.value = false
-		}
-		emit(valuePropPassed.value ? 'change' : 'update:modelValue', val)
-	},
+watch(selectedValue, (val) => {
+	query.value = ''
+	emit(valuePropPassed.value ? 'change' : 'update:modelValue', val)
 })
 
-function close() {
-	showOptions.value = false
+function clearValue() {
+	emit('update:modelValue', null)
 }
 
 const groups = computed(() => {
-	if (!props.options || props.options.length == 0) return []
+	if (!props.options?.length) return []
 
-	let groups = props.options[0]?.group
+	const normalized = props.options[0]?.group
 		? props.options
 		: [{ group: '', items: props.options }]
-
-	return groups
-		.map((group, i) => {
-			return {
-				key: i,
-				group: group.group,
-				hideLabel: group.hideLabel || false,
-				items: props.filterable ? filterOptions(group.items) : group.items,
-			}
-		})
+	return normalized
+		.map((group, i) => ({
+			key: i,
+			group: group.group,
+			hideLabel: group.hideLabel || false,
+			items: props.filterable ? filterOptions(group.items) : group.items,
+		}))
 		.filter((group) => group.items.length > 0)
 })
 
 function filterOptions(options) {
-	if (!query.value) {
-		return options
-	}
-	return options.filter((option) => {
-		let searchTexts = [option.label, option.value]
-		return searchTexts.some((text) =>
-			(text || '').toString().toLowerCase().includes(query.value.toLowerCase())
-		)
+	if (!query.value) return options
+	const q = query.value.toLowerCase()
+	return options.filter((option) =>
+		[option.label, option.value]
+			.filter(Boolean)
+			.some((text) => text.toString().toLowerCase().includes(q))
+	)
+}
+
+watchDebounced(
+	query,
+	(val) => {
+		emit('update:query', val)
+	},
+	{ debounce: 300 }
+)
+
+const onFocus = () => {
+	trigger.value?.$el.click()
+	nextTick(() => {
+		search.value?.focus()
 	})
 }
 
-function displayValue(option) {
-	if (typeof option === 'string') {
-		let allOptions = groups.value.flatMap((group) => group.items)
-		let selectedOption = allOptions.find((o) => o.value === option)
-		return selectedOption?.label || option
-	}
-	return option?.label
+const close = () => {
+	selectedValue.value = null
+	trigger.value?.$el.click()
 }
 
-watch(query, (q) => {
-	emit('update:query', q)
-})
-
-watch(showOptions, (val) => {
-	if (val) {
-		nextTick(() => {
-			search.value.el.focus()
-		})
-	}
-})
-
-const textColor = computed(() => {
-	return props.disabled ? 'text-ink-gray-5' : 'text-ink-gray-8'
-})
+const textColor = computed(() =>
+	props.disabled ? 'text-ink-gray-5' : 'text-ink-gray-8'
+)
 
 const inputClasses = computed(() => {
-	let sizeClasses = {
+	const sizeClasses = {
 		sm: 'text-base rounded h-7',
 		md: 'text-base rounded h-8',
 		lg: 'text-lg rounded-md h-10',
 		xl: 'text-xl rounded-md h-10',
 	}[props.size]
 
-	let paddingClasses = {
+	const paddingClasses = {
 		sm: 'py-1.5 px-2',
 		md: 'py-1.5 px-2.5',
 		lg: 'py-1.5 px-3',
 		xl: 'py-1.5 px-3',
 	}[props.size]
 
-	let variant = props.disabled ? 'disabled' : props.variant
-	let variantClasses = {
+	const variant = props.disabled ? 'disabled' : props.variant
+
+	const variantClasses = {
 		subtle:
 			'border border-gray-100 bg-surface-gray-2 placeholder-ink-gray-4 hover:border-outline-gray-modals hover:bg-surface-gray-3 focus:bg-surface-white focus:border-outline-gray-4 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3',
 		outline:
@@ -307,6 +244,4 @@ const inputClasses = computed(() => {
 		'transition-colors w-full',
 	]
 })
-
-defineExpose({ query })
 </script>
diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index 5742a6fe..a84cea4f 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -11,7 +11,6 @@
 			:size="attrs.size || 'sm'"
 			:variant="attrs.variant"
 			:placeholder="attrs.placeholder"
-			:filterable="false"
 			:readonly="attrs.readonly"
 		>
 			<template #target="{ open, togglePopover }">
@@ -96,8 +95,7 @@ const value = computed({
 	get: () => (valuePropPassed.value ? attrs.value : props.modelValue),
 	set: (val) => {
 		return (
-			val?.value &&
-			emit(valuePropPassed.value ? 'change' : 'update:modelValue', val?.value)
+			val && emit(valuePropPassed.value ? 'change' : 'update:modelValue', val)
 		)
 	},
 })
diff --git a/frontend/src/components/Controls/MultiSelect.vue b/frontend/src/components/Controls/MultiSelect.vue
index cd8b7b8a..063dea4a 100644
--- a/frontend/src/components/Controls/MultiSelect.vue
+++ b/frontend/src/components/Controls/MultiSelect.vue
@@ -1,177 +1,145 @@
 <template>
 	<div>
-		<label class="block mb-1" :class="labelClasses" v-if="label">
+		<label v-if="label" class="block mb-1" :class="labelClasses">
 			{{ label }}
-			<span class="text-ink-red-3" v-if="required">*</span>
+			<span v-if="required" class="text-ink-red-3">*</span>
 		</label>
-		<div class="w-full">
-			<Combobox v-model="selectedValue" nullable>
-				<Popover class="w-full" v-model:show="showOptions">
-					<template #target="{ togglePopover }">
-						<ComboboxInput
-							ref="search"
-							class="search-input form-input w-full focus-visible:!ring-0"
-							type="text"
-							:value="query"
-							@change="
-								(e) => {
-									query = e.target.value
-									showOptions = true
-								}
-							"
-							@click="
-								(e) => {
-									showOptions = true
-									nextTick(() => {
-										setFocus()
-									})
-								}
-							"
-							@focus="
-								() => {
-									if (!filterOptions.data || filterOptions.data.length === 0) {
-										reload('')
-									}
-								}
-							"
-							autocomplete="off"
-						/>
-					</template>
-					<template #body="{ isOpen, close }">
-						<div v-show="isOpen">
-							<div
-								class="flex flex-col mt-1 rounded-lg bg-surface-white py-1 text-base border-2 max-h-[13rem]"
+		<Combobox v-model="selectedValue" nullable v-slot="{ open }">
+			<div class="relative w-full">
+				<ComboboxInput
+					ref="search"
+					class="form-input w-full focus-visible:!ring-0"
+					type="text"
+					@change="
+						(e) => {
+							query = e.target.value
+						}
+					"
+					autocomplete="off"
+					@focus="onFocus"
+				/>
+				<ComboboxButton ref="trigger" class="hidden" />
+				<ComboboxOptions
+					v-show="open"
+					static
+					class="absolute z-20 mt-1 w-full rounded-lg bg-surface-white border-2 max-h-[13rem] flex flex-col"
+				>
+					<div
+						class="flex-1 my-1 overflow-y-auto px-1.5"
+						:class="options.length ? 'min-h-[6rem]' : 'min-h-[3.8rem]'"
+					>
+						<template v-if="options.length">
+							<ComboboxOption
+								v-for="option in options"
+								:key="option.value"
+								:value="option"
+								v-slot="{ active }"
 							>
-								<ComboboxOptions
-									class="flex-1 my-1 overflow-y-auto px-1.5"
-									:class="options.length ? 'min-h-[6rem]' : 'min-h-[3.8rem]'"
-									static
+								<li
+									:class="[
+										'flex cursor-pointer items-center rounded px-2 py-1 text-base',
+										{ 'bg-surface-gray-2': active },
+									]"
 								>
-									<ComboboxOption
-										v-if="options.length"
-										v-for="option in options"
-										:key="option.value"
-										:value="option"
-										v-slot="{ active }"
-									>
-										<li
-											:class="[
-												'flex cursor-pointer items-center rounded px-2 py-1 text-base',
-												{ 'bg-surface-gray-2': active },
-											]"
-										>
-											<div class="flex flex-col gap-1 p-1">
-												<div class="text-base font-medium text-ink-gray-8">
-													{{
-														option.value == option.label
-															? option.description
-															: option.label
-													}}
-												</div>
-												<div class="text-sm text-ink-gray-5">
-													{{ option.value }}
-												</div>
-											</div>
-										</li>
-									</ComboboxOption>
-									<div v-else class="text-ink-gray-7 px-4">
-										{{ __('No results found') }}
+									<div class="flex flex-col gap-1 p-1">
+										<div class="text-base font-medium text-ink-gray-8">
+											{{
+												option.value === option.label
+													? option.description
+													: option.label
+											}}
+										</div>
+										<div class="text-sm text-ink-gray-5">
+											{{ option.value }}
+										</div>
 									</div>
-								</ComboboxOptions>
-								<div v-if="attrs.onCreate" class="px-1 pt-2 bg-white border-t">
-									<Button
-										variant="ghost"
-										class="w-full !justify-start"
-										:label="__('Create New')"
-										@click="attrs.onCreate(close)"
-									>
-										<template #prefix>
-											<Plus class="h-4 w-4 stroke-1.5" />
-										</template>
-									</Button>
-								</div>
-							</div>
+								</li>
+							</ComboboxOption>
+						</template>
+
+						<div v-else class="text-ink-gray-7 px-4 py-2">
+							{{ __('No results found') }}
 						</div>
-					</template>
-				</Popover>
-			</Combobox>
-		</div>
-		<div v-if="values.length" class="grid grid-cols-2 gap-2 mt-1">
+					</div>
+
+					<div
+						v-if="attrs.onCreate"
+						class="p-1 bg-surface-white border-t rounded-b-lg"
+					>
+						<Button
+							variant="ghost"
+							class="w-full !justify-start"
+							:label="__('Create New')"
+							@click="attrs.onCreate()"
+						>
+							<template #prefix>
+								<Plus class="h-4 w-4 stroke-1.5" />
+							</template>
+						</Button>
+					</div>
+				</ComboboxOptions>
+			</div>
+		</Combobox>
+
+		<!-- Selected values -->
+		<div v-if="values?.length" class="grid grid-cols-2 gap-2 mt-1">
 			<div
 				v-for="value in values"
-				class="flex items-center justify-between break-all bg-surface-gray-2 text-ink-gray-7 word-wrap p-2 rounded-md mr-2"
+				:key="value"
+				class="flex items-center justify-between break-all bg-surface-gray-2 text-ink-gray-7 p-2 rounded-md"
 			>
-				<span class="break-all">
-					{{ value }}
-				</span>
+				<span>{{ value }}</span>
 				<X
 					class="size-4 stroke-1.5 cursor-pointer"
 					@click="removeValue(value)"
 				/>
 			</div>
 		</div>
-		<!-- <ErrorMessage class="mt-2 pl-2" v-if="error" :message="error" /> -->
 	</div>
 </template>
 
 <script setup>
 import {
 	Combobox,
+	ComboboxButton,
 	ComboboxInput,
 	ComboboxOptions,
 	ComboboxOption,
 } from '@headlessui/vue'
-import { createResource, Popover, Button } from 'frappe-ui'
-import { ref, computed, nextTick, useAttrs } from 'vue'
-import { set, watchDebounced } from '@vueuse/core'
+import { createResource, Button } from 'frappe-ui'
+import { ref, computed, useAttrs, watch } from 'vue'
+import { watchDebounced } from '@vueuse/core'
 import { X, Plus } from 'lucide-vue-next'
 
 const props = defineProps({
-	label: {
-		type: String,
-	},
-	size: {
-		type: String,
-		default: 'sm',
-	},
-	doctype: {
-		type: String,
-		required: true,
-	},
-	filters: {
-		type: Object,
-		default: () => ({}),
-	},
-	validate: {
-		type: Function,
-		default: null,
-	},
+	label: String,
+	size: { type: String, default: 'sm' },
+	doctype: { type: String, required: true },
+	filters: { type: Object, default: () => ({}) },
+	validate: Function,
 	errorMessage: {
 		type: Function,
 		default: (value) => `${value} is an Invalid value`,
 	},
-	required: {
-		type: Boolean,
-	},
+	required: Boolean,
 })
 
 const values = defineModel()
 const attrs = useAttrs()
-const search = ref(null)
-const error = ref(null)
+const trigger = ref(null)
 const query = ref('')
 const text = ref('')
-const showOptions = ref(false)
+const selectedValue = ref(null)
+const error = ref(null)
+
 const emit = defineEmits(['update:modelValue'])
 
-const selectedValue = computed({
-	get: () => query.value || '',
-	set: (val) => {
-		query.value = ''
-		val?.value && addValue(val.value)
-		showOptions.value = false
-		emit('update:modelValue', values.value)
-	},
+watch(selectedValue, (val) => {
+	if (!val?.value) return
+	query.value = ''
+	addValue(val.value)
+	selectedValue.value = null
+	emit('update:modelValue', values.value)
 })
 
 watchDebounced(
@@ -188,7 +156,6 @@ watchDebounced(
 const filterOptions = createResource({
 	url: 'frappe.desk.search.search_link',
 	method: 'POST',
-	cache: [text.value, props.doctype],
 	auto: true,
 	params: {
 		txt: text.value,
@@ -197,7 +164,6 @@ const filterOptions = createResource({
 })
 
 const options = computed(() => {
-	setFocus()
 	const allOptions = filterOptions.data || []
 	return allOptions.filter((option) => !values.value?.includes(option.value))
 })
@@ -212,52 +178,46 @@ function reload(val) {
 	filterOptions.reload()
 }
 
-const addValue = (value) => {
-	error.value = null
-	if (value) {
-		const splitValues = value.split(',')
-		splitValues.forEach((value) => {
-			value = value.trim()
-			if (value) {
-				// check if value is not already in the values array
-				if (!values.value?.includes(value)) {
-					// check if value is valid
-					if (value && props.validate && !props.validate(value)) {
-						error.value = props.errorMessage(value)
-						return
-					}
-					// add value to values array
-					if (!values.value) {
-						values.value = [value]
-					} else {
-						values.value.push(value)
-					}
-					value = value.replace(value, '')
-				}
-			}
-		})
-		!error.value && (value = '')
+function onFocus() {
+	if (!filterOptions.data?.length) {
+		reload('')
 	}
+	trigger.value?.$el.click()
 }
 
-const removeValue = (value) => {
-	values.value = values.value.filter((v) => v !== value)
+function addValue(value) {
+	error.value = null
+
+	if (!value) return
+
+	const splitValues = value.split(',')
+
+	splitValues.forEach((val) => {
+		val = val.trim()
+
+		if (!val) return
+		if (values.value?.includes(val)) return
+
+		if (props.validate && !props.validate(val)) {
+			error.value = props.errorMessage(val)
+			return
+		}
+
+		if (!values.value) values.value = [val]
+		else values.value.push(val)
+	})
+}
+
+function removeValue(value) {
+	let indexToRemove = values.value.indexOf(value)
+	if (indexToRemove > -1) {
+		values.value.splice(indexToRemove, 1)
+	}
 	emit('update:modelValue', values.value)
 }
 
-function setFocus() {
-	search.value.$el.focus()
-}
-
-defineExpose({ setFocus })
-
-const labelClasses = computed(() => {
-	return [
-		{
-			sm: 'text-xs',
-			md: 'text-base',
-		}[props.size || 'sm'],
-		'text-ink-gray-5',
-	]
-})
+const labelClasses = computed(() => [
+	{ sm: 'text-xs', md: 'text-base' }[props.size || 'sm'],
+	'text-ink-gray-5',
+])
 </script>
diff --git a/frontend/src/components/CourseCardOverlay.vue b/frontend/src/components/CourseCardOverlay.vue
index 3353d97d..f449a844 100644
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -93,7 +93,7 @@
 			<div class="space-y-4">
 				<div
 					class="font-medium text-ink-gray-9"
-					:class="{ 'mt-8': course.data.membership && !readOnlyMode }"
+					:class="{ 'mt-8': !readOnlyMode }"
 				>
 					{{ __('This course has:') }}
 				</div>
diff --git a/frontend/src/components/CourseReviews.vue b/frontend/src/components/CourseReviews.vue
index 6900d832..04a39bf2 100644
--- a/frontend/src/components/CourseReviews.vue
+++ b/frontend/src/components/CourseReviews.vue
@@ -80,7 +80,7 @@ const props = defineProps({
 		required: true,
 	},
 	membership: {
-		type: Object,
+		type: Object || null,
 		required: false,
 	},
 })
diff --git a/frontend/src/components/Modals/StudentModal.vue b/frontend/src/components/Modals/StudentModal.vue
index f1d0ae90..074a425f 100644
--- a/frontend/src/components/Modals/StudentModal.vue
+++ b/frontend/src/components/Modals/StudentModal.vue
@@ -18,7 +18,6 @@
 				<Link
 					doctype="User"
 					v-model="student"
-					:filters="{ ignore_user_type: 1 }"
 					placeholder=" "
 					:label="__('Student')"
 					:onCreate="
diff --git a/frontend/src/components/Settings/Categories.vue b/frontend/src/components/Settings/Categories.vue
index 905839a1..be4247ec 100644
--- a/frontend/src/components/Settings/Categories.vue
+++ b/frontend/src/components/Settings/Categories.vue
@@ -55,7 +55,7 @@
 						v-if="editing?.name !== cat.name"
 						class="flex items-center justify-between group text-sm"
 					>
-						<div @dblclick="allowEdit(cat, index)">
+						<div class="text-ink-gray-9" @dblclick="allowEdit(cat, index)">
 							{{ cat.category }}
 						</div>
 						<Button
diff --git a/frontend/src/components/Settings/Members.vue b/frontend/src/components/Settings/Members.vue
index 4b542a8f..5c79926f 100644
--- a/frontend/src/components/Settings/Members.vue
+++ b/frontend/src/components/Settings/Members.vue
@@ -117,7 +117,15 @@
 	</Dialog>
 </template>
 <script setup lang="ts">
-import { Avatar, Button, createResource, Dialog, FormControl } from 'frappe-ui'
+import {
+	Avatar,
+	Button,
+	call,
+	createResource,
+	Dialog,
+	FormControl,
+	toast,
+} from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { ref, watch, reactive, inject } from 'vue'
 import { RefreshCw, Plus, Search, Shield } from 'lucide-vue-next'
@@ -184,34 +192,29 @@ const openProfile = (username: string) => {
 	})
 }
 
-const newMember = createResource({
-	url: 'frappe.client.insert',
-	makeParams() {
-		return {
-			doc: {
-				doctype: 'User',
-				first_name: member.first_name,
-				email: member.email,
-			},
-		}
-	},
-	auto: false,
-	onSuccess(data: Member) {
-		show.value = false
-		if (user?.data?.is_system_manager) updateOnboardingStep('invite_students')
-
-		router.push({
-			name: 'ProfileRoles',
-			params: {
-				username: data.username,
-			},
-		})
-	},
-})
-
 const addMember = (close: () => void) => {
-	newMember.reload()
-	close()
+	call('frappe.client.insert', {
+		doc: {
+			doctype: 'User',
+			first_name: member.first_name,
+			email: member.email,
+		},
+	})
+		.then((data: Member) => {
+			if (user?.data?.is_system_manager) updateOnboardingStep('invite_students')
+			show.value = false
+			router.push({
+				name: 'ProfileRoles',
+				params: {
+					username: data.username,
+				},
+			})
+			close()
+		})
+		.catch((err: any) => {
+			console.error(err)
+			toast.error(__(err.messages?.[0] || err))
+		})
 }
 
 watch(search, () => {
diff --git a/frontend/src/components/UpcomingEvaluations.vue b/frontend/src/components/UpcomingEvaluations.vue
index 62582926..14fed3ba 100644
--- a/frontend/src/components/UpcomingEvaluations.vue
+++ b/frontend/src/components/UpcomingEvaluations.vue
@@ -137,7 +137,7 @@ import {
 } from 'lucide-vue-next'
 import { inject, ref, getCurrentInstance, computed } from 'vue'
 import { formatTime } from '@/utils'
-import { Button, createResource, createListResource, call } from 'frappe-ui'
+import { Button, createListResource, call, toast } from 'frappe-ui'
 import EvaluationModal from '@/components/Modals/EvaluationModal.vue'
 import { Menu, MenuButton, MenuItems, MenuItem } from '@headlessui/vue'
 
@@ -183,6 +183,7 @@ const upcoming_evals = createListResource({
 		'start_time',
 		'evaluator_name',
 		'course_title',
+		'member',
 		'google_meet_link',
 	],
 	orderBy: 'date',
@@ -227,11 +228,15 @@ const cancelEvaluation = (evl) => {
 				theme: 'red',
 				variant: 'solid',
 				onClick(close) {
-					call('lms.lms.api.cancel_evaluation', { evaluation: evl }).then(
-						() => {
+					call('lms.lms.api.cancel_evaluation', { evaluation: evl })
+						.then(() => {
 							upcoming_evals.reload()
-						}
-					)
+							toast.success(__('Evaluation cancelled successfully'))
+						})
+						.catch((err) => {
+							toast.error(__(err.messages?.[0] || err))
+							console.error(err)
+						})
 					close()
 				},
 			},
diff --git a/frontend/src/pages/Courses/CourseDashboard.vue b/frontend/src/pages/Courses/CourseDashboard.vue
index 1c9fa8c5..e6484e15 100644
--- a/frontend/src/pages/Courses/CourseDashboard.vue
+++ b/frontend/src/pages/Courses/CourseDashboard.vue
@@ -20,7 +20,7 @@
 			<NumberChartGraph :title="__('Lessons')" :value="course.data?.lessons" />
 		</div>
 		<div class="grid grid-cols-[2fr_1fr] gap-5 items-start">
-			<div v-if="course.data?.enrollments" class="border rounded-lg py-3 px-4">
+			<div class="border rounded-lg py-3 px-4">
 				<div class="flex items-center justify-between mb-3">
 					<div class="text-lg text-ink-gray-9 font-semibold">
 						{{ __('Students') }}
@@ -244,6 +244,7 @@
 		v-if="showEnrollmentModal"
 		v-model="showEnrollmentModal"
 		:course="course"
+		:students="progressList"
 	/>
 	<StudentCourseProgress
 		v-if="showProgressModal"
diff --git a/frontend/src/pages/Courses/CourseEnrollmentModal.vue b/frontend/src/pages/Courses/CourseEnrollmentModal.vue
index ebc2f95d..958cafa9 100644
--- a/frontend/src/pages/Courses/CourseEnrollmentModal.vue
+++ b/frontend/src/pages/Courses/CourseEnrollmentModal.vue
@@ -58,6 +58,7 @@ import Link from '@/components/Controls/Link.vue'
 
 const show = defineModel<boolean>({ required: true, default: false })
 const student = ref<string | null>(null)
+const students = defineModel<any[]>('students')
 const payment = ref<string | null>(null)
 const purchasedCertificate = ref<boolean>(false)
 
@@ -79,6 +80,7 @@ const enrollStudent = (close: () => void) => {
 		},
 	})
 		.then(() => {
+			students.value?.reload()
 			toast.success(__('Student enrolled successfully'))
 			close()
 		})
diff --git a/frontend/src/pages/Courses/CourseOverview.vue b/frontend/src/pages/Courses/CourseOverview.vue
index a2759c07..a2a987ad 100644
--- a/frontend/src/pages/Courses/CourseOverview.vue
+++ b/frontend/src/pages/Courses/CourseOverview.vue
@@ -76,7 +76,7 @@
 				<CourseReviews
 					:courseName="course.data.name"
 					:avg_rating="course.data.rating"
-					:membership="course.data.membership"
+					:membership="course.data.membership || null"
 				/>
 			</div>
 			<div class="hidden md:block">
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 2261349c..f560d061 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -162,20 +162,21 @@ export function getEditorTools() {
 			config: {
 				services: {
 					youtube: {
-						regex: /(?:https?:\/\/)?(?:www\.)?(?:(?:youtu\.be\/)|(?:youtube\.com)\/(?:v\/|u\/\w\/|embed\/|watch))(?:(?:\?v=)?([^#&?=]*))?((?:[?&]\w*=\w*)*)/,
+						regex: /^(?:https?:\/\/)?(?:www\.)?(?:(?:youtu\.be\/)|(?:youtube\.com)\/(?:v\/|u\/\w\/|embed\/|watch))(?:(?:\?v=)?([^#&?=]*))?((?:[?&]\w*=\w*)*)$/,
 						embedUrl: '<%= remote_id %>',
 						/* 'https://www.youtube.com/embed/<%= remote_id %>?origin=https://plyr.io&amp;iv_load_policy=3&amp;modestbranding=1&amp;playsinline=1&amp;showinfo=0&amp;rel=0&amp;enablejsapi=1' */
 						html: `<div class="video-player" data-plyr-provider="youtube"></div>`,
 						id: ([id]) => id,
 					},
 					vimeo: {
-						regex: /(?:http[s]?:\/\/)?(?:www\.)?vimeo\.com\/(\d+)/,
-						embedUrl: '<%= remote_id %>',
+						regex: /^(?:http[s]?:\/\/)?(?:www\.)?vimeo\.com\/(\d+)(?:\/([a-zA-Z0-9]+))?(?:\?[^\s]*)?$/,
+						embedUrl:
+							'https://player.vimeo.com/video/<%= remote_id %>',
 						html: `<div class="video-player" data-plyr-provider="vimeo"></div>`,
-						id: ([id]) => id,
+						id: ([id, hash]) => (hash ? `${id}?h=${hash}` : id),
 					},
 					cloudflareStream: {
-						regex: /https:\/\/customer-[a-z0-9]+\.cloudflarestream\.com\/([a-f0-9]{32})\/watch/,
+						regex: /^https:\/\/customer-[a-z0-9]+\.cloudflarestream\.com\/([a-f0-9]{32})\/watch$/,
 						embedUrl:
 							'https://iframe.videodelivery.net/<%= remote_id %>',
 						html: `<iframe style="width:100%; height: ${
@@ -183,7 +184,7 @@ export function getEditorTools() {
 						};" frameborder="0" allowfullscreen></iframe>`,
 					},
 					bunnyStream: {
-						regex: /https:\/\/(?:iframe\.mediadelivery\.net|video\.bunnycdn\.com)\/play\/([a-zA-Z0-9]+\/[a-zA-Z0-9-]+)/,
+						regex: /^https:\/\/(?:iframe\.mediadelivery\.net|video\.bunnycdn\.com)\/play\/([a-zA-Z0-9]+\/[a-zA-Z0-9-]+)$/,
 						embedUrl:
 							'https://iframe.mediadelivery.net/embed/<%= remote_id %>',
 						html: `<iframe style="width:100%; height: ${
@@ -192,7 +193,7 @@ export function getEditorTools() {
 					},
 					codepen: true,
 					aparat: {
-						regex: /(?:http[s]?:\/\/)?(?:www.)?aparat\.com\/v\/([^\/\?\&]+)\/?/,
+						regex: /^(?:http[s]?:\/\/)?(?:www.)?aparat\.com\/v\/([^\/\?\&]+)\/?$/,
 						embedUrl:
 							'https://www.aparat.com/video/video/embed/videohash/<%= remote_id %>/vt/frame',
 						html: `<iframe style="margin: 0 auto; width: 100%; height: ${
@@ -201,7 +202,7 @@ export function getEditorTools() {
 					},
 					github: true,
 					slides: {
-						regex: /https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/pub/,
+						regex: /^https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/pub$/,
 						embedUrl:
 							'https://docs.google.com/presentation/d/<%= remote_id %>/embed',
 						html: `<iframe style='width: 100%; height: ${
@@ -209,7 +210,7 @@ export function getEditorTools() {
 						}; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0' frameborder='0' allowfullscreen='true'></iframe>`,
 					},
 					drive: {
-						regex: /https:\/\/drive\.google\.com\/file\/d\/([A-Za-z0-9_-]+)\/view(\?.+)?/,
+						regex: /^https:\/\/drive\.google\.com\/file\/d\/([A-Za-z0-9_-]+)\/view(\?.+)?$/,
 						embedUrl:
 							'https://drive.google.com/file/d/<%= remote_id %>/preview',
 						html: `<iframe style='width: 100%; height: ${
@@ -217,19 +218,19 @@ export function getEditorTools() {
 						}; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>`,
 					},
 					docsPublic: {
-						regex: /https:\/\/docs\.google\.com\/document\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?/,
+						regex: /^https:\/\/docs\.google\.com\/document\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?$/,
 						embedUrl:
 							'https://docs.google.com/document/d/<%= remote_id %>/preview',
 						html: "<iframe style='width: 100%; height: 40rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 					sheetsPublic: {
-						regex: /https:\/\/docs\.google\.com\/spreadsheets\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?/,
+						regex: /^https:\/\/docs\.google\.com\/spreadsheets\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?$/,
 						embedUrl:
 							'https://docs.google.com/spreadsheets/d/<%= remote_id %>/preview',
 						html: "<iframe style='width: 100%; height: 40rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 					slidesPublic: {
-						regex: /https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?/,
+						regex: /^https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?$/,
 						embedUrl:
 							'https://docs.google.com/presentation/d/<%= remote_id %>/embed',
 						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0;' frameborder='0' allowfullscreen='true'></iframe>",
diff --git a/frontend/src/utils/markdownParser.js b/frontend/src/utils/markdownParser.js
index 493bcb47..1e3cf6dd 100644
--- a/frontend/src/utils/markdownParser.js
+++ b/frontend/src/utils/markdownParser.js
@@ -1,5 +1,6 @@
 import { CodeXml } from 'lucide-vue-next'
 import { createApp, h } from 'vue'
+import { escapeHTML } from '@/utils'
 
 export class Markdown {
 	constructor({ data, api, readOnly, config }) {
@@ -301,7 +302,7 @@ export class Markdown {
 	_parseInlineMarkdown(text) {
 		if (!text) return ''
 
-		let html = this._escapeHtml(text)
+		let html = escapeHTML(text)
 
 		html = html.replace(/`([^`]+)`/g, '<code class="inline-code">$1</code>')
 
@@ -316,15 +317,6 @@ export class Markdown {
 		return html
 	}
 
-	_escapeHtml(text) {
-		return text
-			.replace(/&/g, '&amp;')
-			.replace(/</g, '&lt;')
-			.replace(/>/g, '&gt;')
-			.replace(/"/g, '&quot;')
-			.replace(/'/g, '&#39;')
-	}
-
 	_togglePlaceholder() {
 		const blocks = document.querySelectorAll(
 			'.cdx-block.ce-paragraph[data-placeholder]'
@@ -429,16 +421,6 @@ export class Markdown {
 		return { alt: '', url: '' }
 	}
 
-	_isLink(text) {
-		return /\[.+?\]\(.+?\)/.test(text)
-	}
-
-	_extractLink(text) {
-		const match = text.match(/\[(.+?)\]\((.+?)\)/)
-		if (match) return { text: match[1], url: match[2] }
-		return { text: '', url: '' }
-	}
-
 	_isEmbed(text) {
 		return /^https?:\/\/.+/.test(text.trim())
 	}
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 71d7f0e9..e3abd376 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -927,9 +927,9 @@
     "@marijn/find-cluster-break" "^1.0.0"
 
 "@codemirror/view@6.x", "@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.35.0", "@codemirror/view@^6.37.0":
-  version "6.39.13"
-  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.39.13.tgz#9a0e2549391723056e029236887170cd1d2901b1"
-  integrity sha512-QBO8ZsgJLCbI28KdY0/oDy5NQLqOQVZCozBknxc2/7L98V+TVYFHnfaCsnGh1U+alpd2LOkStVwYY7nW2R1xbw==
+  version "6.39.14"
+  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.39.14.tgz#ebecaee4c76566c3eb61dfe4d6bf386c617de5cf"
+  integrity sha512-WJcvgHm/6Q7dvGT0YFv/6PSkoc36QlR0VCESS6x9tGsnF1lWLmmYxOgX3HH6v8fo6AvSLgpcs+H0Olre6MKXlg==
   dependencies:
     "@codemirror/state" "^6.5.0"
     crelt "^1.0.6"
@@ -2121,9 +2121,9 @@ acorn@^8.14.1, acorn@^8.15.0:
   integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
 
 ajv@^8.6.0:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
-  integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.18.0.tgz#8864186b6738d003eb3a933172bb3833e10cefbc"
+  integrity sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==
   dependencies:
     fast-deep-equal "^3.1.3"
     fast-uri "^3.0.1"
@@ -4037,9 +4037,9 @@ pretty-bytes@^6.1.1:
   integrity sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==
 
 prosemirror-changeset@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.3.1.tgz#eee3299cfabc7a027694e9abdc4e85505e9dd5e7"
-  integrity sha512-j0kORIBm8ayJNl3zQvD1TTPHJX3g042et6y/KQhZhnPrruO8exkTgG8X+NRpj7kIyMMEx74Xb3DyMIBtO0IKkQ==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.4.0.tgz#8d8ea0290cb9545c298ec427ac3a8f298c39170f"
+  integrity sha512-LvqH2v7Q2SF6yxatuPP2e8vSUKS/L+xAU7dPDC4RMyHMhZoGDfBC74mYuyYF4gLqOEG758wajtyhNnsTkuhvng==
   dependencies:
     prosemirror-transform "^1.0.0"
 
diff --git a/lms/auth.py b/lms/auth.py
index e84f2de4..868194d0 100644
--- a/lms/auth.py
+++ b/lms/auth.py
@@ -47,6 +47,7 @@ ALLOWED_PATHS = [
 	"/api/method/frappe.core.doctype.user.user.reset_password",
 	"/api/method/frappe.desk.doctype.notification_log.notification_log.mark_as_read",
 	"/api/method/frappe.desk.doctype.notification_log.notification_log.mark_all_as_read",
+	"/api/method/frappe.sessions.clear",
 ]
 
 
diff --git a/lms/install.py b/lms/install.py
index f2bd0575..9862f0dd 100644
--- a/lms/install.py
+++ b/lms/install.py
@@ -7,6 +7,7 @@ from lms.lms.api import give_discussions_permission
 def after_install():
 	create_batch_source()
 	give_discussions_permission()
+	give_user_list_permission()
 
 
 def after_sync():
@@ -27,13 +28,6 @@ def create_lms_roles():
 	create_lms_student_role()
 
 
-def delete_lms_roles():
-	roles = ["Course Creator", "Moderator"]
-	for role in roles:
-		if frappe.db.exists("Role", role):
-			frappe.db.delete("Role", role)
-
-
 def create_course_creator_role():
 	if frappe.db.exists("Role", "Course Creator"):
 		frappe.db.set_value("Role", "Course Creator", "desk_access", 0)
@@ -185,3 +179,36 @@ def give_lms_roles_to_admin():
 			doc.parentfield = "roles"
 			doc.role = role
 			doc.save()
+
+
+def give_user_list_permission():
+	doctype = "User"
+	roles = ["Course Creator", "Moderator", "Batch Evaluator"]
+	for role in roles:
+		permlevel = 0
+		create_role(doctype, role, permlevel)
+	create_role(doctype, "System Manager", 1)
+
+
+def create_role(doctype, role, permlevel):
+	if not frappe.db.exists("Custom DocPerm", {"parent": doctype, "role": role, "permlevel": permlevel}):
+		doc = frappe.new_doc("Custom DocPerm")
+		doc.update(
+			{
+				"doctype": "Custom DocPerm",
+				"parent": doctype,
+				"role": role,
+				"read": 1,
+				"write": 1 if role in ["Moderator", "System Manager"] else 0,
+				"create": 1 if role == "Moderator" else 0,
+				"permlevel": permlevel,
+			}
+		)
+		doc.save()
+
+
+def delete_lms_roles():
+	roles = ["Course Creator", "Moderator", "Batch Evaluator", "LMS Student"]
+	for role in roles:
+		if frappe.db.exists("Role", role):
+			frappe.db.delete("Role", role)
diff --git a/lms/lms/api.py b/lms/lms/api.py
index 00097e83..d9849999 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -1308,6 +1308,7 @@ def get_lms_settings():
 @frappe.whitelist()
 def cancel_evaluation(evaluation: dict):
 	evaluation = frappe._dict(evaluation)
+	print(evaluation.member, frappe.session.user)
 	if evaluation.member != frappe.session.user:
 		frappe.throw(_("You do not have permission to cancel this evaluation."), frappe.PermissionError)
 
@@ -1511,6 +1512,7 @@ def validate_meta_data_permissions(meta_type: str):
 
 @frappe.whitelist()
 def create_programming_exercise_submission(exercise: str, submission: str, code: str, test_cases: list):
+	frappe.only_for(["Moderator", "Course Creator", "Batch Evaluator"])
 	if submission == "new":
 		return make_new_exercise_submission(exercise, code, test_cases)
 	else:
@@ -2037,7 +2039,7 @@ def get_upcoming_batches():
 
 @frappe.whitelist()
 def delete_programming_exercise(exercise: str):
-	frappe.only_for(["Moderator", "Course Creator"])
+	frappe.only_for(["Moderator", "Course Creator", "Batch Evaluator"])
 	frappe.db.delete("LMS Programming Exercise Submission", {"exercise": exercise})
 	frappe.db.delete("LMS Programming Exercise", exercise)
 
diff --git a/lms/lms/doctype/lms_enrollment/lms_enrollment.py b/lms/lms/doctype/lms_enrollment/lms_enrollment.py
index 9145f72e..e2d39429 100644
--- a/lms/lms/doctype/lms_enrollment/lms_enrollment.py
+++ b/lms/lms/doctype/lms_enrollment/lms_enrollment.py
@@ -8,9 +8,15 @@ from frappe.utils import ceil
 
 
 class LMSEnrollment(Document):
-	def before_insert(self):
+	def validate(self):
 		self.validate_duplicate_enrollment()
 		self.validate_course_enrollment_eligibility()
+		self.validate_owner()
+
+	def validate_owner(self):
+		"""Makes the member as the owner of the document so that users can update their progress"""
+		if self.owner != self.member:
+			self.owner = self.member
 
 	def on_update(self):
 		update_program_progress(self.member)
@@ -45,7 +51,7 @@ class LMSEnrollment(Document):
 		if self.enrollment_from_batch:
 			return
 
-		if not course_details.published:
+		if not course_details.published and not is_admin():
 			frappe.throw(_("You cannot enroll in an unpublished course."))
 
 		if course_details.paid_course:
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index f61b58c5..174fea24 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1010,12 +1010,7 @@ def get_lesson(course: str, chapter: int, lesson: int) -> dict:
 		as_dict=1,
 	)
 
-	if (
-		not lesson_details.include_in_preview
-		and not membership
-		and not has_moderator_role()
-		and not is_instructor(course)
-	):
+	if not lesson_details.include_in_preview and not membership and not can_modify_course(course):
 		return {
 			"no_preview": 1,
 			"title": lesson_details.title,
@@ -2047,6 +2042,13 @@ def get_program_details(program_name: str) -> dict:
 	if not guest_access_allowed():
 		frappe.throw(_("Please login to view program details."))
 
+	is_published = frappe.db.get_value("LMS Program", program_name, "published")
+	is_member = frappe.db.exists(
+		"LMS Program Member", {"parent": program_name, "member": frappe.session.user}
+	)
+	if not is_published and not is_member:
+		frappe.throw(_("You are not authorized to view the details of this program."))
+
 	program = frappe.db.get_value(
 		"LMS Program",
 		program_name,
diff --git a/lms/locale/es.po b/lms/locale/es.po
index 391ea4e7..05f5a5c8 100644
--- a/lms/locale/es.po
+++ b/lms/locale/es.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
 "POT-Creation-Date: 2026-01-23 16:05+0000\n"
-"PO-Revision-Date: 2026-02-05 06:43\n"
+"PO-Revision-Date: 2026-02-12 13:58\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -2291,7 +2291,7 @@ msgstr "Detalles de la educación"
 #: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/templates/signup-form.html:10
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #: frontend/src/components/Modals/Event.vue:16
 msgid "Email ID"
@@ -2850,7 +2850,7 @@ msgstr "Francés (por ejemplo, Distinción)"
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Friday"
-msgstr ""
+msgstr "Viernes"
 
 #. Label of the unavailable_from (Date) field in DocType 'Course Evaluator'
 #: frontend/src/pages/ProfileEvaluator.vue:106
@@ -4380,7 +4380,7 @@ msgstr "Módulo incorrecto."
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Monday"
-msgstr ""
+msgstr "Lunes"
 
 #: frontend/src/components/Sidebar/AppSidebar.vue:561
 msgid "Monetization"
@@ -5914,7 +5914,7 @@ msgstr ""
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Saturday"
-msgstr ""
+msgstr "Sábado"
 
 #. Button label of the job-opportunity Web Form
 #: frontend/src/components/AssessmentPlugin.vue:12
@@ -5983,7 +5983,7 @@ msgstr "Puntuación fuera de"
 #: frontend/src/pages/Jobs.vue:57 frontend/src/pages/Search/Search.vue:5
 #: frontend/src/pages/Search/Search.vue:250
 msgid "Search"
-msgstr ""
+msgstr "Buscar"
 
 #: frontend/src/components/Modals/CourseProgressSummary.vue:17
 #: frontend/src/components/Modals/VideoStatistics.vue:20
@@ -6480,7 +6480,7 @@ msgstr "Resumen"
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Sunday"
-msgstr ""
+msgstr "Domingo"
 
 #: lms/lms/api.py:995
 msgid "Suspicious pattern found in {0}: {1}"
@@ -6536,7 +6536,7 @@ msgstr ""
 #: lms/lms/doctype/user_skill/user_skill.json
 #: lms/lms/doctype/zoom_settings/zoom_settings.json
 msgid "System Manager"
-msgstr ""
+msgstr "Administrador del sistema"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
 #: frontend/src/pages/CourseForm.vue:51
@@ -6791,7 +6791,7 @@ msgstr ""
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Thursday"
-msgstr ""
+msgstr "Jueves"
 
 #. Label of the time (Time) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/Event.vue:54
@@ -6974,7 +6974,7 @@ msgstr "Inténtelo de nuevo"
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Tuesday"
-msgstr ""
+msgstr "Martes"
 
 #: frontend/src/pages/ProfileAbout.vue:105
 msgid "Twitter"
@@ -7287,7 +7287,7 @@ msgstr ""
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Wednesday"
-msgstr ""
+msgstr "Miércoles"
 
 #: lms/templates/emails/lms_invite_request_approved.html:4
 msgid "Welcome to {0}!"
diff --git a/lms/locale/fa.po b/lms/locale/fa.po
index 902d7606..232d4265 100644
--- a/lms/locale/fa.po
+++ b/lms/locale/fa.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
 "POT-Creation-Date: 2026-01-23 16:05+0000\n"
-"PO-Revision-Date: 2026-02-05 06:43\n"
+"PO-Revision-Date: 2026-02-15 14:24\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -985,7 +985,7 @@ msgstr ""
 #: lms/lms/doctype/lms_category/lms_category.json
 #: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
-msgstr "دسته بندی"
+msgstr "دسته‌بندی"
 
 #: frontend/src/components/Settings/Categories.vue:39
 msgid "Category Name"
diff --git a/lms/locale/pt.po b/lms/locale/pt.po
index 65b5c0a3..bf802c02 100644
--- a/lms/locale/pt.po
+++ b/lms/locale/pt.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
 "POT-Creation-Date: 2026-01-23 16:05+0000\n"
-"PO-Revision-Date: 2026-02-05 06:43\n"
+"PO-Revision-Date: 2026-02-15 14:24\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr ""
 #: frontend/src/components/Controls/ChildTable.vue:77
 #: frontend/src/components/Settings/Coupons/CouponItems.vue:55
 msgid "Add Row"
-msgstr ""
+msgstr "Adicionar Linha"
 
 #: frontend/src/pages/ProfileEvaluator.vue:96
 msgid "Add Slot"
diff --git a/lms/locale/pt_BR.po b/lms/locale/pt_BR.po
index 5665c7e6..85072e96 100644
--- a/lms/locale/pt_BR.po
+++ b/lms/locale/pt_BR.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
 "POT-Creation-Date: 2026-01-23 16:05+0000\n"
-"PO-Revision-Date: 2026-02-05 06:43\n"
+"PO-Revision-Date: 2026-02-14 14:28\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Portuguese, Brazilian\n"
 "MIME-Version: 1.0\n"
@@ -7831,7 +7831,7 @@ msgstr ""
 
 #: frontend/src/components/StudentHeatmap.vue:10
 msgid "weeks"
-msgstr ""
+msgstr "semanas"
 
 #: lms/templates/emails/mentor_request_creation_email.html:5
 msgid "you can"
diff --git a/lms/patches.txt b/lms/patches.txt
index fc7b88e4..e6a6e90d 100644
--- a/lms/patches.txt
+++ b/lms/patches.txt
@@ -115,4 +115,6 @@ lms.patches.v2_0.fix_scorm_lesson_reference_idx #02-09-2025
 lms.patches.v2_0.certified_members_to_certifications #05-10-2025
 lms.patches.v2_0.fix_job_application_resume_urls
 lms.patches.v2_0.open_to_opportunities
-lms.patches.v2_0.open_to_work
\ No newline at end of file
+lms.patches.v2_0.open_to_work
+lms.patches.v2_0.share_enrollment
+lms.patches.v2_0.give_user_list_permission #11-02-2026
\ No newline at end of file
diff --git a/lms/patches/v2_0/give_user_list_permission.py b/lms/patches/v2_0/give_user_list_permission.py
new file mode 100644
index 00000000..be1d753f
--- /dev/null
+++ b/lms/patches/v2_0/give_user_list_permission.py
@@ -0,0 +1,5 @@
+from lms.install import give_user_list_permission
+
+
+def execute():
+	give_user_list_permission()
diff --git a/lms/patches/v2_0/share_enrollment.py b/lms/patches/v2_0/share_enrollment.py
new file mode 100644
index 00000000..4834cbef
--- /dev/null
+++ b/lms/patches/v2_0/share_enrollment.py
@@ -0,0 +1,20 @@
+import frappe
+
+
+def execute():
+	enrollments = frappe.get_all("LMS Enrollment", ["name", "member", "owner"])
+
+	for enrollment in enrollments:
+		if enrollment.owner == enrollment.member:
+			continue
+		filters = {
+			"user": enrollment.member,
+			"share_doctype": "LMS Enrollment",
+			"share_name": enrollment.name,
+		}
+		is_shared = frappe.db.exists("DocShare", filters)
+		if not is_shared:
+			share = frappe.new_doc("DocShare")
+			filters.update({"read": 1, "write": 1, "notify_by_email": 0})
+			share.update(filters)
+			share.save()