diff --git a/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html b/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
index 8090f4511..95e405c27 100644
--- a/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
+++ b/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
@@ -21,10 +21,7 @@
             <div class="form-group">
                 <div class="form-control">
                     <div class="checkbox">
-                        <label>
-                            <input type="checkbox" name="">
-                            <span>QIDO supports including fields</span>
-                        </label>
+                        {{>inputCheckbox key='qidoSupportsIncludeField'}}
                     </div>
                 </div>
             </div>
diff --git a/Packages/ohif-core/client/components/base/index.js b/Packages/ohif-core/client/components/base/index.js
index bdc4cb34a..bc57de0ae 100644
--- a/Packages/ohif-core/client/components/base/index.js
+++ b/Packages/ohif-core/client/components/base/index.js
@@ -10,6 +10,7 @@ import './mixins/formItem.js';
 import './mixins/group.js';
 import './mixins/groupRadio.js';
 import './mixins/input.js';
+import './mixins/checkbox.js';
 import './mixins/schemaData.js';
 import './mixins/select.js';
 import './mixins/select2.js';
diff --git a/Packages/ohif-core/client/components/base/mixins/checkbox.js b/Packages/ohif-core/client/components/base/mixins/checkbox.js
new file mode 100644
index 000000000..20071c4e0
--- /dev/null
+++ b/Packages/ohif-core/client/components/base/mixins/checkbox.js
@@ -0,0 +1,26 @@
+import { OHIF } from 'meteor/ohif:core';
+import { Template } from 'meteor/templating';
+import { _ } from 'meteor/underscore';
+
+/*
+ * inputCheckbox: controls a checkbox input
+ */
+OHIF.mixins.checkbox = new OHIF.Mixin({
+    dependencies: 'input',
+    composition: {
+        onCreated() {
+            const instance = Template.instance();
+            const component = instance.component;
+
+            // Get or set the checked state using jQuery's prop method
+            component.value = value => {
+                const isGet = _.isUndefined(value);
+                if (isGet) {
+                    return component.$element.is(':checked');
+                }
+
+                component.$element.prop('checked', value);
+            };
+        }
+    }
+});
diff --git a/Packages/ohif-core/client/components/bootstrap/index.js b/Packages/ohif-core/client/components/bootstrap/index.js
index b8aa81556..2baa5508b 100644
--- a/Packages/ohif-core/client/components/bootstrap/index.js
+++ b/Packages/ohif-core/client/components/bootstrap/index.js
@@ -1,6 +1,7 @@
 import './form/form.html';
 import './form/group.html';
 
+import './input/checkbox.html';
 import './input/hidden.html';
 import './input/groupRadio.html';
 import './input/radio.html';
diff --git a/Packages/ohif-core/client/components/bootstrap/input/checkbox.html b/Packages/ohif-core/client/components/bootstrap/input/checkbox.html
new file mode 100644
index 000000000..038312206
--- /dev/null
+++ b/Packages/ohif-core/client/components/bootstrap/input/checkbox.html
@@ -0,0 +1,15 @@
+<template name="inputCheckbox">
+    {{#baseComponent (extend this
+        base='baseInput'
+        type='checkbox'
+        mixins=(concat 'checkbox ' this.mixins)
+        labelAfter=(valueIf (isUndefined this.labelAfter) true this.labelAfter)
+        labelClass=(concat 'checkboxLabel ' this.labelClass)
+        wrappers=(concat ''
+            (valueIf reactive this.label 'wrapperLabel ' '')
+            this.wrappers
+        )
+    )}}
+        {{>UI.contentBlock}}
+    {{/baseComponent}}
+</template>
diff --git a/Packages/ohif-core/client/components/bootstrap/input/radio.html b/Packages/ohif-core/client/components/bootstrap/input/radio.html
index 4e72172df..d2377667e 100644
--- a/Packages/ohif-core/client/components/bootstrap/input/radio.html
+++ b/Packages/ohif-core/client/components/bootstrap/input/radio.html
@@ -4,7 +4,7 @@
         type='radio'
         mixins=(concat 'input ' this.mixins)
         labelAfter=(valueIf (isUndefined this.labelAfter) true this.labelAfter)
-        labelClass=(concat 'checkboxLabel ' this.labelClass)
+        labelClass=(concat 'radioLabel ' this.labelClass)
         wrappers=(concat ''
             (valueIf reactive this.label 'wrapperLabel ' '')
             this.wrappers