diff --git a/ui/components/controls/Check.vue b/ui/components/controls/Check.vue
index 6b1ec936..d8b98c31 100644
--- a/ui/components/controls/Check.vue
+++ b/ui/components/controls/Check.vue
@@ -1,7 +1,12 @@
 <template>
     <div class="form-group">
         <div class="custom-control custom-checkbox">
-            <input class="custom-control-input" type="checkbox" :id="id" v-model="checkboxValue" @change="emitChange">
+            <input class="custom-control-input" type="checkbox"
+              :id="id"
+              v-model="checkboxValue"
+              @change="emitChange"
+              :disabled="disabled"
+            >
             <label class="custom-control-label" :for="id">{{ docfield.label }}</label>
         </div>
     </div>
diff --git a/ui/components/controls/Date.vue b/ui/components/controls/Date.vue
index d152c830..7e6a9e24 100644
--- a/ui/components/controls/Date.vue
+++ b/ui/components/controls/Date.vue
@@ -1,19 +1,12 @@
 <template>
-  <div class="form-group" v-if="!onlyInput">
-    <label>{{ docfield.label }}</label>
+  <div :class="{'form-group': !onlyInput}">
+    <label v-if="!onlyInput">{{ docfield.label }}</label>
     <flat-pickr
       :value="value"
       class="form-control"
       @on-change="emitChange">
     </flat-pickr>
   </div>
-  <flat-pickr
-    v-else
-    :value="value"
-    class="form-control"
-    @on-change="emitChange"
-  >
-  </flat-pickr>
 </template>
 <script>
 import flatPickr from 'vue-flatpickr-component';
diff --git a/ui/components/controls/File.vue b/ui/components/controls/File.vue
index ccae4734..95a3d8f6 100644
--- a/ui/components/controls/File.vue
+++ b/ui/components/controls/File.vue
@@ -38,7 +38,8 @@ export default {
         id: this.id,
         type: 'file',
         value: this.value,
-        required: this.docfield.required
+        required: this.docfield.required,
+        disabled: this.disabled
       }
     }
   }
diff --git a/ui/components/controls/Password.vue b/ui/components/controls/Password.vue
index ae0c4fa7..12e50b8b 100644
--- a/ui/components/controls/Password.vue
+++ b/ui/components/controls/Password.vue
@@ -10,7 +10,8 @@ export default {
         id: this.id,
         type: 'password',
         value: this.value,
-        required: this.docfield.required
+        required: this.docfield.required,
+        disabled: this.disabled
       };
     },
   }
diff --git a/ui/components/controls/Select.vue b/ui/components/controls/Select.vue
index 5aceb8eb..9d3f07ce 100644
--- a/ui/components/controls/Select.vue
+++ b/ui/components/controls/Select.vue
@@ -9,7 +9,8 @@ export default {
         getInputAttrs() {
             return {
                 id: this.id,
-                required: this.docfield.required
+                required: this.docfield.required,
+                disabled: this.disabled
             };
         },
         getInputChildren(h) {