diff --git a/rpc.js b/rpc.js
index d6f661155..48c25b8ef 100644
--- a/rpc.js
+++ b/rpc.js
@@ -1479,7 +1479,7 @@ RPC.create = function (
                     Respond(void 0, "OK");
                 });
             case 'REMOVE_PINS':
-                return void removePins(Env, safeKey, function (e, response) {
+                return void removePins(Env, safeKey, function (e) {
                     if (e) { return void Respond(e); }
                     Respond(void 0, "OK");
                 });
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index a240cf13c..97d7a6d00 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -583,7 +583,7 @@ define([
     Store.resetDrive = function (data, cb) {
         nThen(function (waitFor) {
             removeOwnedPads(waitFor);
-        }).nThen(function (waitFor) {
+        }).nThen(function () {
             store.proxy.drive = store.fo.getStructure();
             onSync(cb);
         });
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 3ecd49ce8..344929988 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -335,6 +335,7 @@ define([
         $button.click(function () {
             $spinner.show();
             UI.confirm(Messages.settings_deleteConfirm, function (yes) {
+                if (!yes) { return; }
                 sframeChan.query("Q_SETTINGS_DELETE_ACCOUNT", null, function (err, data) {
                     // Owned drive
                     if (data.state === true) {