diff --git a/app/client/alarm_settings.html b/app/client/alarm_settings.html
index deb8d12..572dc26 100644
--- a/app/client/alarm_settings.html
+++ b/app/client/alarm_settings.html
@@ -83,7 +83,7 @@
                           </td>
                           <td>
                             <label class="switch">
-                              <input type="checkbox" checked={{sensor.on}} />
+                              <input type="checkbox" checked={{sensor.on}} class="sensor_switch" />
                               <div class="slider round"></div>
                             </label>
                           </td>
diff --git a/app/client/alarm_settings.js b/app/client/alarm_settings.js
index c3c332e..ce0ac58 100644
--- a/app/client/alarm_settings.js
+++ b/app/client/alarm_settings.js
@@ -35,7 +35,7 @@ Template.alarm_settings.helpers({
 
   sensors: function() {
     var temperatures = Meteor.zoblak.client.last_sensor_reading().temperatures;
-    var enabled = config()['enabled'] || {};
+    var enabled = config()['sensorsEnabled'] || {};
     var sensors = [];
     for (var index in temperatures) {
       var is_on = (index in enabled) ? enabled[index] : true; // on by default
@@ -63,6 +63,15 @@ Template.alarm_settings.events({
     var sms3 = instance.$('#sms3').val();
     var sms4 = instance.$('#sms4').val();
 
-    Meteor.call('saveAlarmSettings', controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, [sms1, sms2, sms3, sms4]);
+    var sensorSwitches = instance.$('.sensor_switch');
+    var enabled = {};
+
+    sensorSwitches.each( function(index,element) {
+      enabled[index] = instance.$(element).is(':checked');
+    } );
+
+    console.log("Enabled: ", enabled);
+
+    Meteor.call('saveAlarmSettings', controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, [sms1, sms2, sms3, sms4] ,enabled);
   }
 });
diff --git a/app/server/methods.js b/app/server/methods.js
index c4e8d8b..f13cc6c 100644
--- a/app/server/methods.js
+++ b/app/server/methods.js
@@ -143,7 +143,7 @@ function saveControllerConfig(controller_id, time, days, manualInflow) {
   });
 }
 
-function saveAlarmSettings(controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, smsNumbers) {
+function saveAlarmSettings(controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, smsNumbers, sensorsEnabled) {
   var state = Meteor.zoblak.server.controller_state(controller_id);
   ControllerState.update(state._id, {
     '$set': {
@@ -155,7 +155,8 @@ function saveAlarmSettings(controller_id, minTemperature, maxTemperature, timeou
       'config.sms1': smsNumbers[0],
       'config.sms2': smsNumbers[1],
       'config.sms3': smsNumbers[2],
-      'config.sms4': smsNumbers[3]
+      'config.sms4': smsNumbers[3],
+      'config.sensorsEnabled': sensorsEnabled
     }
   });