diff --git a/frontend/src/components/Settings/BrandSettings.vue b/frontend/src/components/Settings/BrandSettings.vue
index e1e04177..75780c89 100644
--- a/frontend/src/components/Settings/BrandSettings.vue
+++ b/frontend/src/components/Settings/BrandSettings.vue
@@ -1,16 +1,25 @@
 <template>
-	<div class="flex flex-col justify-between h-full">
+	<div class="flex flex-col h-full">
 		<div>
 			<div class="flex items-center justify-between">
 				<div class="font-semibold mb-1 text-ink-gray-9">
 					{{ __(label) }}
 				</div>
-				<Badge
-					v-if="isDirty"
-					:label="__('Not Saved')"
-					variant="subtle"
-					theme="orange"
-				/>
+				<div class="space-x-2">
+					<Badge
+						v-if="isDirty"
+						:label="__('Not Saved')"
+						variant="subtle"
+						theme="orange"
+					/>
+					<Button
+						variant="solid"
+						:loading="saveSettings.loading"
+						@click="update"
+					>
+						{{ __('Update') }}
+					</Button>
+				</div>
 			</div>
 			<div class="text-xs text-ink-gray-5">
 				{{ __(description) }}
@@ -19,11 +28,6 @@
 		<div class="overflow-y-auto">
 			<SettingFields :sections="sections" :data="branding.data" />
 		</div>
-		<div class="flex flex-row-reverse mt-auto">
-			<Button variant="solid" :loading="saveSettings.loading" @click="update">
-				{{ __('Update') }}
-			</Button>
-		</div>
 	</div>
 </template>
 <script setup>
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index b31f9f97..1a021f1e 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -8,7 +8,7 @@
 					<h1 class="mb-3 px-2 pt-2 text-lg font-semibold text-ink-gray-9">
 						{{ __('Settings') }}
 					</h1>
-					<div class="space-y-6">
+					<div class="space-y-5">
 						<div v-for="tab in tabs" :key="tab.label">
 							<div
 								v-if="!tab.hideLabel"
diff --git a/frontend/src/pages/Courses/CourseForm.vue b/frontend/src/pages/Courses/CourseForm.vue
index 3cb4cfff..000b7461 100644
--- a/frontend/src/pages/Courses/CourseForm.vue
+++ b/frontend/src/pages/Courses/CourseForm.vue
@@ -368,25 +368,27 @@ const courseResource = createDocumentResource({
 	doctype: 'LMS Course',
 	name: props.course.data?.name,
 	auto: true,
-	transform(data) {
-		updateCourseData(data)
-	},
-	onSuccess(data) {
-		check_permission()
-		getMetaInfo('courses', data.name, meta)
-	},
 })
 
-const updateCourseData = (data) => {
-	Object.keys(data).forEach((key) => {
+watch(
+	() => courseResource.doc,
+	() => {
+		check_permission()
+		getMetaInfo('courses', courseResource.doc?.name, meta)
+		updateCourseData()
+	}
+)
+
+const updateCourseData = () => {
+	Object.keys(courseResource.doc).forEach((key) => {
 		if (key == 'instructors') {
 			instructors.value = []
-			data.instructors.forEach((instructor) => {
+			courseResource.doc.instructors.forEach((instructor) => {
 				instructors.value.push(instructor.instructor)
 			})
 		} else if (key == 'related_courses') {
 			related_courses.value = []
-			data.related_courses.forEach((course) => {
+			courseResource.doc.related_courses.forEach((course) => {
 				related_courses.value.push(course.course)
 			})
 		}
@@ -402,7 +404,7 @@ const updateCourseData = (data) => {
 	]
 	for (let idx in checkboxes) {
 		let key = checkboxes[idx]
-		data[key] = data[key] ? true : false
+		courseResource.doc[key] = courseResource.doc[key] ? true : false
 	}
 }