diff --git a/crm/api/doc.py b/crm/api/doc.py
index aa704a3d..5f1c9cf2 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -660,22 +660,7 @@ def get_fields(doctype: str, allow_all_fieldtypes: bool = False):
 
 	for field in fields:
 		if field.fieldtype not in not_allowed_fieldtypes and field.fieldname:
-			_fields.append(
-				{
-					"label": field.label,
-					"type": field.fieldtype,
-					"value": field.fieldname,
-					"options": field.options,
-					"mandatory": field.reqd,
-					"read_only": field.read_only,
-					"hidden": field.hidden,
-					"depends_on": field.depends_on,
-					"mandatory_depends_on": field.mandatory_depends_on,
-					"read_only_depends_on": field.read_only_depends_on,
-					"link_filters": field.get("link_filters"),
-					"placeholder": field.get("placeholder"),
-				}
-			)
+			_fields.append(field)
 
 	return _fields
 
diff --git a/frontend/src/components/Settings/SettingsPage.vue b/frontend/src/components/Settings/SettingsPage.vue
index 8e13ed7c..f6618e5c 100644
--- a/frontend/src/components/Settings/SettingsPage.vue
+++ b/frontend/src/components/Settings/SettingsPage.vue
@@ -42,7 +42,7 @@ import {
   Badge,
   ErrorMessage,
 } from 'frappe-ui'
-import { evaluateDependsOnValue, createToast, getRandom } from '@/utils'
+import { createToast, getRandom } from '@/utils'
 import { ref, computed } from 'vue'
 
 const props = defineProps({
@@ -117,10 +117,10 @@ const tabs = computed(() => {
   fieldsData.forEach((field) => {
     let last_tab = _tabs[_tabs.length - 1]
     let _sections = _tabs.length ? last_tab.sections : []
-    if (field.type === 'Tab Break') {
+    if (field.fieldtype === 'Tab Break') {
       _tabs.push({
         label: field.label,
-        name: field.value,
+        name: field.fieldname,
         sections: [
           {
             name: 'section_' + getRandom(),
@@ -128,33 +128,21 @@ const tabs = computed(() => {
           },
         ],
       })
-    } else if (field.type === 'Section Break') {
+    } else if (field.fieldtype === 'Section Break') {
       _sections.push({
         label: field.label,
-        name: field.value,
+        name: field.fieldname,
         columns: [{ name: 'column_' + getRandom(), fields: [] }],
       })
-    } else if (field.type === 'Column Break') {
+    } else if (field.fieldtype === 'Column Break') {
       _sections[_sections.length - 1].columns.push({
-        name: field.value,
+        name: field.fieldname,
         fields: [],
       })
     } else {
       let last_section = _sections[_sections.length - 1]
       let last_column = last_section.columns[last_section.columns.length - 1]
-      last_column.fields.push({
-        ...field,
-        filters: field.link_filters && JSON.parse(field.link_filters),
-        display_via_depends_on: evaluateDependsOnValue(
-          field.depends_on,
-          data.doc,
-        ),
-        mandatory_via_depends_on: evaluateDependsOnValue(
-          field.mandatory_depends_on,
-          data.doc,
-        ),
-        name: field.value,
-      })
+      last_column.fields.push(field)
     }
   })