diff --git a/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html b/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
index 95e405c27..478aa1b0b 100644
--- a/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
+++ b/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
@@ -30,28 +30,21 @@
     <hr>
     <h4>Request options</h4>
     <div class="row">
-        {{>serverInformationFormField name="requestOptions.auth" label="Authentication"}}
+        <div class="col-lg-6">
+            {{>inputText labelClass='form-group' key='requestOptions.auth'}}
+        </div>
         <div class="col-lg-6">
             <strong>Logging options</strong>
             <div class="form-group">
                 <div class="form-control clearfix">
                     <div class="checkbox pull-left">
-                        <label>
-                            <input type="checkbox" name="requestOptions.logRequests">
-                            <span>Requests</span>
-                        </label>
+                        {{>inputCheckbox key='requestOptions.logRequests'}}
                     </div>
                     <div class="checkbox pull-left">
-                        <label>
-                            <input type="checkbox" name="requestOptions.logResponses">
-                            <span>Responses</span>
-                        </label>
+                        {{>inputCheckbox key='requestOptions.logResponses'}}
                     </div>
                     <div class="checkbox pull-left">
-                        <label>
-                            <input type="checkbox" name="requestOptions.logTiming">
-                            <span>Timing</span>
-                        </label>
+                        {{>inputCheckbox key='requestOptions.logTiming'}}
                     </div>
                 </div>
             </div>
diff --git a/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.js b/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.js
index d067f8f0f..270811222 100644
--- a/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.js
+++ b/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.js
@@ -1,10 +1,10 @@
 Template.serverInformationDicomWeb.onRendered(function() {
     var instance = Template.instance();
     instance.autorun(function() {
-        var mode = instance.data.mode.get();
+        const mode = instance.data.mode.get();
         if (mode === 'edit') {
-            var data = instance.data.currentItem.get();
-            FormUtils.setFormData(instance.data.$form, data);
+            const data = instance.data.currentItem.get();
+            instance.data.form.value(data);
         }
     });
 });
diff --git a/Packages/lesiontracker/client/components/serverInformation/serverInformationForm/serverInformationForm.js b/Packages/lesiontracker/client/components/serverInformation/serverInformationForm/serverInformationForm.js
index fda1e38bf..699c2d847 100644
--- a/Packages/lesiontracker/client/components/serverInformation/serverInformationForm/serverInformationForm.js
+++ b/Packages/lesiontracker/client/components/serverInformation/serverInformationForm/serverInformationForm.js
@@ -1,5 +1,6 @@
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 import { DICOMWebServer as dicomSchema } from 'meteor/worklist/both/schema';
 import { DIMSEServer as dimseSchema } from 'meteor/worklist/both/schema';
 
@@ -12,7 +13,7 @@ Template.serverInformationForm.onCreated(() => {
 Template.serverInformationForm.onRendered(() => {
     const instance = Template.instance();
 
-    instance.data.$form = instance.$('form');
+    instance.data.$form = instance.$('form:first');
     instance.data.form = instance.data.$form.data('component');
 
     // Handle the server type
@@ -21,7 +22,7 @@ Template.serverInformationForm.onRendered(() => {
         const typeComponent = instance.$('[data-key=type]').data('component');
 
         // Run this computation every time the user change the server type
-        typeComponent.changeObserver.depend();
+        typeComponent.depend();
 
         // Get the current server type value
         const type = typeComponent.value();
@@ -43,7 +44,7 @@ Template.serverInformationForm.onRendered(() => {
 
         // Check if it is on edit mode and load the saved data
         if (mode === 'edit') {
-            var data = instance.data.currentItem.get();
+            const data = instance.data.currentItem.get();
             instance.data.form.value(data);
         }
     });
diff --git a/Packages/ohif-core/client/components/base/mixins/form.js b/Packages/ohif-core/client/components/base/mixins/form.js
index 345c0891a..cc2061faf 100644
--- a/Packages/ohif-core/client/components/base/mixins/form.js
+++ b/Packages/ohif-core/client/components/base/mixins/form.js
@@ -26,6 +26,24 @@ OHIF.mixins.form = new OHIF.Mixin({
                 component.schema = schema && schema.newContext();
             });
 
+            // Get a registered item in form by its key
+            component.item = itemKey => {
+                let found;
+
+                // Iterate over each registered form item
+                component.registeredItems.forEach(child => {
+                    const key = child.templateInstance.data.key;
+
+                    // Change the found item if current key is the same as given
+                    if (key === itemKey) {
+                        found = child;
+                    }
+                });
+
+                // Return the found item or undefined if it was not found
+                return found;
+            };
+
             // Check if the form data is valid in its schema
             component.validate = () => {
                 // Assume validation result as true