diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index 8af32de96..059f00cb0 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -15,7 +15,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
       value: config.hideNextSteps.enabled
     };
     $scope.usePincode = {
-      enabled: config.pincode ? config.pincode.enabled : false
+      value: config.pincode ? config.pincode.enabled : false
     };
   };
 
@@ -41,6 +41,23 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
     });
   };
 
+  $scope.savePincodeChanges = function(val) {
+    if (!val || val.length < 4) {
+      $scope.usePincode = {
+        value: false
+      }
+      return;
+    }
+    var opts = {
+      usePincode: {
+        enabled: $scope.usePincode.enabled
+      },
+    };
+    configService.set(opts, function(err) {
+      if (err) $log.debug(err);
+    });
+  };
+
   $scope.recentTransactionsChange = function() {
     var opts = {
       recentTransactions: {
diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html
index ee20c46e0..ac92e9be0 100644
--- a/www/views/advancedSettings.html
+++ b/www/views/advancedSettings.html
@@ -29,14 +29,14 @@
         <span class="toggle-label" translate>Hide Next Steps Card</span>
       </ion-toggle>
 
-      <!-- <div ng-if="isCordova"> -->
+      <div ng-if="isCordova">
         <div class="item item-divider"></div>
 
         <a class="item item-icon-right" ui-sref="tabs.lockapp">
           <span translate>Lock App</span>
           <i class="icon bp-arrow-right"></i>
         </a>
-      <!-- </div> -->
+      </div>
     </div>
   </ion-content>
 </ion-view>