diff --git a/apps/activityreminder/ChangeLog b/apps/activityreminder/ChangeLog
index 3811425ac..76f0945c8 100644
--- a/apps/activityreminder/ChangeLog
+++ b/apps/activityreminder/ChangeLog
@@ -8,3 +8,4 @@
 0.08: Use default Bangle formatter for booleans
 0.09: New app screen (instead of showing settings or the alert) and some optimisations
 0.10: Add software back button via setUI
+0.11: Add setting to unlock screen
diff --git a/apps/activityreminder/alert.js b/apps/activityreminder/alert.js
index 96a9b76c4..8b359a073 100644
--- a/apps/activityreminder/alert.js
+++ b/apps/activityreminder/alert.js
@@ -26,6 +26,12 @@
     if (!(storage.readJSON('setting.json', 1) || {}).quiet) {
       Bangle.buzz(400);
     }
+
+    if ((storage.readJSON('activityreminder.s.json', 1) || {}).unlock) {
+      Bangle.setLocked(false);
+      Bangle.setLCDPower(1);
+    }
+
     setTimeout(load, 20000);
   }
 
@@ -34,4 +40,4 @@
   Bangle.drawWidgets();
   run();
 
-})();
\ No newline at end of file
+})();
diff --git a/apps/activityreminder/metadata.json b/apps/activityreminder/metadata.json
index a7fb0c487..a5df15a26 100644
--- a/apps/activityreminder/metadata.json
+++ b/apps/activityreminder/metadata.json
@@ -3,7 +3,7 @@
   "name": "Activity Reminder",
   "shortName":"Activity Reminder",
   "description": "A reminder to take short walks for the ones with a sedentary lifestyle",
-  "version":"0.10",
+  "version":"0.11",
   "icon": "app.png",
   "type": "app",
   "tags": "tool,activity",
diff --git a/apps/activityreminder/settings.js b/apps/activityreminder/settings.js
index 051c0dcd8..28082a8a0 100644
--- a/apps/activityreminder/settings.js
+++ b/apps/activityreminder/settings.js
@@ -75,7 +75,14 @@
           settings.tempThreshold = v;
           activityreminder.writeSettings(settings);
         }
-      }
+      },
+      'Unlock on alarm': {
+        value: !!settings.unlock,
+        onchange: v => {
+          settings.unlock = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
     };
 
     return mainMenu;
diff --git a/apps/sleepphasealarm/ChangeLog b/apps/sleepphasealarm/ChangeLog
index b22db7170..d6e3cb30b 100644
--- a/apps/sleepphasealarm/ChangeLog
+++ b/apps/sleepphasealarm/ChangeLog
@@ -18,3 +18,4 @@
       Limit logging on Bangle.js 1 to one day due to low memory
       Add plot logged data to settings
 0.15: Convert Yes/No On/Off in settings to checkboxes
+0.16: Fix Keep alarm enabled inverted settings
diff --git a/apps/sleepphasealarm/metadata.json b/apps/sleepphasealarm/metadata.json
index 4ad1588ea..aa69694ab 100644
--- a/apps/sleepphasealarm/metadata.json
+++ b/apps/sleepphasealarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "sleepphasealarm",
   "name": "SleepPhaseAlarm",
   "shortName": "SleepPhaseAlarm",
-  "version": "0.15",
+  "version": "0.16",
   "description": "Uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments (ESS, see https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en). This app will read the next alarm from the alarm application and will wake you up to 30 minutes early at the best guessed time when you are almost already awake.",
   "icon": "app.png",
   "tags": "tool,alarm",
diff --git a/apps/sleepphasealarm/settings.js b/apps/sleepphasealarm/settings.js
index 626de6cd0..e72d95e7f 100644
--- a/apps/sleepphasealarm/settings.js
+++ b/apps/sleepphasealarm/settings.js
@@ -90,9 +90,9 @@
     E.showMenu({
       "" : { "title" : "SleepPhaseAlarm" },
       'Keep alarm enabled': {
-        value: !!config.settings.disableAlarm,
+        value: !config.settings.disableAlarm,
         onchange: v => {
-          config.settings.disableAlarm = v;
+          config.settings.disableAlarm = !v;
           writeSettings();
         }
       },   "< Back" : () => back(),