diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index efb9e907c5..4bf9c81b39 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -20,6 +20,10 @@ body {
   top: 40px;
 }
 
+.table .value-row td, .table .inputs td {
+    vertical-align: middle;
+}
+
 .glyphicon-remove {
   font-size: 24px;
 }
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 970e7551c4..a38d544502 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -233,7 +233,7 @@ $(document).ready(function(){
   });
 
   // Bootstrap switch in table
-  $('#' + Settings.FORM_ID).on('switchChange.bootstrapSwitch', 'input.table-checkbox', function () {
+  $('#' + Settings.FORM_ID).on('change', 'input.table-checkbox', function () {
     // Bootstrap switches in table: set the changed data attribute for all rows in table.
     var row = $(this).closest('tr');
     if (row.hasClass("value-row")) {  // Don't set attribute on input row switches prior to it being added to table.
@@ -851,7 +851,6 @@ function reloadSettings(callback) {
 
     // setup any bootstrap switches
     $('.toggle-checkbox').bootstrapSwitch();
-    $('.table-checkbox').bootstrapSwitch();
 
     // add tooltip to locked settings
     $('label.locked').tooltip({
@@ -1176,7 +1175,7 @@ function addTableRow(add_glyphicon) {
       var input = $(element).find("input")
       var isCheckbox = false;
       if (input.hasClass("table-checkbox")) {
-        input = $(input).parent().parent();
+        input = $(input).parent();
         isCheckbox = true;
       }