diff --git a/addon/components/cfb-jexl-boolean-toggle-switch.js b/addon/components/cfb-jexl-boolean-toggle-switch.js
index 036dab866..d140d3f11 100644
--- a/addon/components/cfb-jexl-boolean-toggle-switch.js
+++ b/addon/components/cfb-jexl-boolean-toggle-switch.js
@@ -3,6 +3,7 @@ import layout from "../templates/components/cfb-jexl-boolean-toggle-switch";
 import jexl from "jexl";
 import { reads } from "@ember/object/computed";
 import { task } from "ember-concurrency";
+import { computed } from "@ember/object";
 
 export default RenderComponent.extend({
   layout,
@@ -19,6 +20,11 @@ export default RenderComponent.extend({
     return yield jexl.eval(this.get("value"));
   }),
 
+  disabled: computed("value", function() {
+    const value = this.get("value");
+    return !(value === "true" || value === "false");
+  }),
+
   actions: {
     toggle(boolValue) {
       this.get("update")(String(boolValue));
diff --git a/addon/templates/components/cfb-form-editor/question.hbs b/addon/templates/components/cfb-form-editor/question.hbs
index 298a83b09..20267d4bc 100644
--- a/addon/templates/components/cfb-form-editor/question.hbs
+++ b/addon/templates/components/cfb-form-editor/question.hbs
@@ -271,6 +271,13 @@
           name="isHidden"
           class="jexl-textarea"
         }}
+
+        {{f.input
+          type="textarea"
+          label=(t "caluma.form-builder.question.isRequired")
+          name="isRequired"
+          class="jexl-textarea"
+        }}
       {{/if}}
 
       <div class="uk-text-right">
diff --git a/addon/templates/components/cfb-jexl-boolean-toggle-switch.hbs b/addon/templates/components/cfb-jexl-boolean-toggle-switch.hbs
index 4706d7b2c..6722ba381 100644
--- a/addon/templates/components/cfb-jexl-boolean-toggle-switch.hbs
+++ b/addon/templates/components/cfb-jexl-boolean-toggle-switch.hbs
@@ -5,5 +5,6 @@
   value=boolValue
   size=size
   name=name
+  disabled=disabled
   update=(action "toggle")
 }}
diff --git a/addon/templates/components/cfb-toggle-switch.hbs b/addon/templates/components/cfb-toggle-switch.hbs
index 70637d380..19e602200 100644
--- a/addon/templates/components/cfb-toggle-switch.hbs
+++ b/addon/templates/components/cfb-toggle-switch.hbs
@@ -5,6 +5,7 @@
     value=value
     size=size
     name=name
+    disabled=disabled
     on-toggle=(action "toggle")
   }}
 </div>