diff --git a/js/app/services/encryptservice.js b/js/app/services/encryptservice.js
index 6767ffb5..1483ebeb 100644
--- a/js/app/services/encryptservice.js
+++ b/js/app/services/encryptservice.js
@@ -34,10 +34,10 @@
 			// AngularJS will instantiate a singleton by calling "new" on this function
 			var encryption_config = {
 				adata: "",
-				iter: 1000,
+				iter: 100000,
 				ks: 256,
 				mode: 'ccm',
-				ts: 64
+				ts: 128
 			};
 
 			return {
diff --git a/js/app/services/settingsservice.js b/js/app/services/settingsservice.js
index 70e07d42..04c18672 100644
--- a/js/app/services/settingsservice.js
+++ b/js/app/services/settingsservice.js
@@ -46,6 +46,9 @@
 			});
 
 			var cookie = localStorageService.get('settings');
+			if (cookie && cookie.defaultVaultPass !== undefined) {
+				delete cookie.defaultVaultPass;
+			}
 			settings = angular.merge(settings, cookie);
 			return {
 				getSettings: function () {
@@ -55,8 +58,11 @@
 					return settings[name];
 				},
 				setSetting: function (name, value) {
+					var storedSettings;
 					settings[name] = value;
-					localStorageService.set('settings', settings);
+					storedSettings = angular.copy(settings);
+					delete storedSettings.defaultVaultPass;
+					localStorageService.set('settings', storedSettings);
 				},
 				isEnabled: function (name) {
 					return settings[name] === 1 || settings[name] === '1';