diff --git a/ui/components/Form/FormLayout.vue b/ui/components/Form/FormLayout.vue
index b7e57414..cfa15176 100644
--- a/ui/components/Form/FormLayout.vue
+++ b/ui/components/Form/FormLayout.vue
@@ -7,6 +7,7 @@
       <div class="col" v-for="(column, j) in section.columns" :key="j">
         <frappe-control
           v-for="fieldname in column.fields"
+          v-if="fieldIsNotHidden(fieldname)"
           :key="fieldname"
           :docfield="getDocField(fieldname)"
           :value="$data[fieldname]"
@@ -58,6 +59,9 @@ export default {
     getDocField(fieldname) {
       return this.fields.find(df => df.fieldname === fieldname);
     },
+    fieldIsNotHidden(fieldname) {
+      return !Boolean(this.getDocField(fieldname).hidden);
+    },
     updateDoc(fieldname, value) {
       this.doc.set(fieldname, value);
     },
diff --git a/ui/components/controls/Base.vue b/ui/components/controls/Base.vue
index ac0d7160..5f7125fc 100644
--- a/ui/components/controls/Base.vue
+++ b/ui/components/controls/Base.vue
@@ -70,7 +70,8 @@ export default {
                 type: 'text',
                 placeholder: '',
                 value: this.value,
-                required: this.docfield.required
+                required: this.docfield.required,
+                disabled: this.docfield.disabled
             }
         },
         getInputListeners() {
diff --git a/ui/components/controls/FrappeControl.vue b/ui/components/controls/FrappeControl.vue
index db6cb830..3b3687b3 100644
--- a/ui/components/controls/FrappeControl.vue
+++ b/ui/components/controls/FrappeControl.vue
@@ -1,5 +1,6 @@
 <template>
-    <component :is="component"
+    <component
+        :is="component"
         :docfield="docfield"
         :value="value"
         :onlyInput="onlyInput"
@@ -7,6 +8,7 @@
     />
 </template>
 <script>
+import Base from './Base';
 import Autocomplete from './Autocomplete';
 import Check from './Check';
 import Code from './Code';
@@ -27,6 +29,16 @@ export default {
     props: ['docfield', 'value', 'onlyInput'],
     computed: {
         component() {
+            if (this.docfield.template) {
+                // for controls with their own template
+                // create a vue object for it
+                return {
+                    extends: Base,
+                    render: null,
+                    template: this.docfield.template()
+                }
+            }
+
             return {
                 Autocomplete,
                 Check,