diff --git a/src/popup/app/lock/lockController.js b/src/popup/app/lock/lockController.js
index d21b1ce5..bc771112 100644
--- a/src/popup/app/lock/lockController.js
+++ b/src/popup/app/lock/lockController.js
@@ -7,21 +7,19 @@
         $('#master-password').focus();
 
         $scope.logOut = function () {
-            loginService.logOut(function () {
-                SweetAlert.swal({
-                    title: 'Log Out',
-                    text: 'Are you sure you want to log out?',
-                    showCancelButton: true,
-                    confirmButtonText: 'Yes',
-                    cancelButtonText: 'Cancel'
-                }, function (confirmed) {
-                    if (confirmed) {
-                        loginService.logOut(function () {
-                            $analytics.eventTrack('Logged Out');
-                            $state.go('home');
-                        });
-                    }
-                });
+            SweetAlert.swal({
+                title: 'Log Out',
+                text: 'Are you sure you want to log out?',
+                showCancelButton: true,
+                confirmButtonText: 'Yes',
+                cancelButtonText: 'Cancel'
+            }, function (confirmed) {
+                if (confirmed) {
+                    loginService.logOut(function () {
+                        $analytics.eventTrack('Logged Out');
+                        $state.go('home');
+                    });
+                }
             });
         };
 
diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js
index 6f5108bc..93a2026c 100644
--- a/src/popup/app/settings/settingsController.js
+++ b/src/popup/app/settings/settingsController.js
@@ -34,7 +34,29 @@
             }
 
             chrome.storage.local.set(obj, function () {
-                cryptoService.toggleKey(function () { });
+                cryptoService.getKeyHash(false, function (keyHash) {
+                    if (keyHash) {
+                        cryptoService.toggleKey(function () { });
+                    }
+                    else {
+                        SweetAlert.swal({
+                            title: 'Logging out',
+                            text: 'You\'ve recently updated to v1.2.0. You must re-log in to change your lock options.' +
+                                'Do you want to log out now?',
+                            showCancelButton: true,
+                            confirmButtonText: 'Yes',
+                            cancelButtonText: 'Cancel'
+                        }, function (confirmed) {
+                            if (confirmed) {
+                                cryptoService.toggleKey(function () { });
+                                loginService.logOut(function () {
+                                    $analytics.eventTrack('Logged Out');
+                                    $state.go('home');
+                                });
+                            }
+                        });
+                    }
+                });
             });
         };