diff --git a/frontend/src/components/Settings/SettingsPage.vue b/frontend/src/components/Settings/SettingsPage.vue
index f6618e5c4..b2445d5aa 100644
--- a/frontend/src/components/Settings/SettingsPage.vue
+++ b/frontend/src/components/Settings/SettingsPage.vue
@@ -18,17 +18,19 @@
         :data="data.doc"
         :doctype="doctype"
       />
-      <ErrorMessage class="mt-2" :message="error" />
     </div>
     <div v-else class="flex flex-1 items-center justify-center">
       <Spinner class="size-8" />
     </div>
-    <div class="flex flex-row-reverse">
+    <div class="flex justify-between gap-2">
+      <div>
+        <ErrorMessage class="mt-2" :message="data.save.error" />
+      </div>
       <Button
         :loading="data.save.loading"
         :label="__('Update')"
         variant="solid"
-        @click="update"
+        @click="data.save.submit()"
       />
     </div>
   </div>
@@ -43,7 +45,7 @@ import {
   ErrorMessage,
 } from 'frappe-ui'
 import { createToast, getRandom } from '@/utils'
-import { ref, computed } from 'vue'
+import { computed } from 'vue'
 
 const props = defineProps({
   doctype: {
@@ -70,8 +72,6 @@ const fields = createResource({
   auto: true,
 })
 
-const error = ref(null)
-
 const data = createDocumentResource({
   doctype: props.doctype,
   name: props.doctype,
@@ -148,29 +148,4 @@ const tabs = computed(() => {
 
   return _tabs
 })
-
-function update() {
-  error.value = null
-  if (validateMandatoryFields()) return
-  data.save.submit()
-}
-
-function validateMandatoryFields() {
-  if (!tabs.value) return false
-  for (let section of tabs.value[0].sections) {
-    for (let column of section.columns) {
-      for (let field of column.fields) {
-        if (
-          (field.mandatory ||
-            (field.mandatory_depends_on && field.mandatory_via_depends_on)) &&
-          !data.doc[field.name]
-        ) {
-          error.value = __('{0} is mandatory', [__(field.label)])
-          return true
-        }
-      }
-    }
-  }
-  return false
-}
 </script>
diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
index 73a969b48..81f68d738 100644
--- a/frontend/src/components/SidePanelLayout.vue
+++ b/frontend/src/components/SidePanelLayout.vue
@@ -66,7 +66,7 @@
                       <div
                         class="w-[35%] min-w-20 shrink-0 truncate text-sm text-ink-gray-5"
                       >
-                        <span>{{ __(field.label) }}</span>
+                        {{ __(field.label) }}
                         <span
                           v-if="
                             field.reqd ||
@@ -74,7 +74,8 @@
                               field.mandatory_via_depends_on)
                           "
                           class="text-ink-red-3"
-                        > *</span>
+                          >*</span
+                        >
                       </div>
                     </Tooltip>
                     <div class="flex items-center justify-between w-[65%]">