diff --git a/js/app/controllers/settings.js b/js/app/controllers/settings.js
index c0849854..5ceeff83 100644
--- a/js/app/controllers/settings.js
+++ b/js/app/controllers/settings.js
@@ -11,6 +11,7 @@ angular.module('passmanApp')
 	.controller('SettingsCtrl', ['$scope', '$rootScope', 'SettingsService', 'VaultService', 'CredentialService', '$location', '$routeParams', '$http', 'EncryptService','NotificationService',
 		function ($scope, $rootScope, SettingsService, VaultService, CredentialService, $location, $routeParams, $http, EncryptService, NotificationService) {
 			$scope.vault_settings = {};
+			$scope.new_vault_name = '';
 			$scope.active_vault = VaultService.getActiveVault();
 			if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
 				if (!$scope.active_vault) {
@@ -35,7 +36,8 @@ angular.module('passmanApp')
 								'avoidAmbiguousCharacters': false,
 								'requireEveryCharType': true,
 								'generateOnCreate': true
-							})
+							});
+						$scope.new_vault_name = angular.copy($scope.active_vault.name);
 					})
 				}
 			}
@@ -43,9 +45,11 @@ angular.module('passmanApp')
 
 			$scope.saveVaultSettings = function () {
 				var _vault = $scope.active_vault;
+				_vault.name = $scope.new_vault_name;
 				_vault.vault_settings = angular.copy($scope.vault_settings);
 				VaultService.updateVault(_vault).then(function () {
 					VaultService.setActiveVault(_vault);
+					$scope.active_vault.name = angular.copy(_vault.name);
 					NotificationService.showNotification('Settings saved', 5000);
 				});
 			};
diff --git a/js/app/services/vaultservice.js b/js/app/services/vaultservice.js
index aa1408b3..37e7e772 100644
--- a/js/app/services/vaultservice.js
+++ b/js/app/services/vaultservice.js
@@ -73,8 +73,9 @@ angular.module('passmanApp')
 			},
 			updateVault: function (vault) {
 				var _vault = angular.copy(vault);
-				delete vault.defaultVaultPass;
-				delete vault.defaultVault;
+				delete _vault.defaultVaultPass;
+				delete _vault.defaultVault;
+				delete _vault.vaultKey;
 				_vault.vault_settings = window.btoa(JSON.stringify(_vault.vault_settings))
 				var queryUrl = OC.generateUrl('apps/passman/api/v2/vaults/' + _vault.vault_id);
 				return $http.patch(queryUrl, _vault).then(function (response) {
diff --git a/js/templates.js b/js/templates.js
index 606ad011..aae95f78 100644
--- a/js/templates.js
+++ b/js/templates.js
@@ -51,7 +51,7 @@ angular.module('views/partials/forms/settings/export.html', []).run(['$templateC
 angular.module('views/partials/forms/settings/general_settings.html', []).run(['$templateCache', function($templateCache) {
   'use strict';
   $templateCache.put('views/partials/forms/settings/general_settings.html',
-    '<div class="row"><div class="col-xs-12 col-md-6"><h3>Change vault key</h3><label>Old vault password</label><input type="password" ng-model="oldVaultPass"><label>New vault password</label><password-gen ng-model="newVaultPass"></password-gen><ng-password-meter password="newVaultPass"></ng-password-meter><label>New vault password</label><input type="password" ng-model="newVaultPass2"> <button ng-click="changeVaultPassword(oldVaultPass,newVaultPass,newVaultPass2)" tooltip="\'Not working :P\'">Change</button></div><div class="col-xs-12 col-md-6"><h3>About passman</h3><p>Version: <b>{{passman_version}}</b><br>Bla bla about passman, changelog.<br><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6YS8F97PETVU2" target="_blank" class="link">Donate to support development</a></p></div></div>');
+    '<div class="row"><div class="col-xs-12 col-md-6"><h3>Rename vault</h3><label>New vault name</label><input type="text" ng-model="$parent.new_vault_name"> <button ng-click="saveVaultSettings()" tooltip="\'Not working :P\'">Change</button><h3>Change vault key</h3><label>Old vault password</label><input type="password" ng-model="oldVaultPass"><label>New vault password</label><password-gen ng-model="newVaultPass"></password-gen><ng-password-meter password="newVaultPass"></ng-password-meter><label>New vault password</label><input type="password" ng-model="newVaultPass2"> <button ng-click="changeVaultPassword(oldVaultPass,newVaultPass,newVaultPass2)" tooltip="\'Not working :P\'">Change</button></div><div class="col-xs-12 col-md-6"><h3>About passman</h3><p>Version: <b>{{passman_version}}</b><br>Bla bla about passman, changelog.<br><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6YS8F97PETVU2" target="_blank" class="link">Donate to support development</a></p></div></div>');
 }]);
 
 angular.module('views/partials/forms/settings/import.html', []).run(['$templateCache', function($templateCache) {
diff --git a/templates/views/partials/forms/settings/general_settings.html b/templates/views/partials/forms/settings/general_settings.html
index 0c3556d5..5522324d 100644
--- a/templates/views/partials/forms/settings/general_settings.html
+++ b/templates/views/partials/forms/settings/general_settings.html
@@ -1,5 +1,11 @@
 <div class="row">
 	<div class="col-xs-12 col-md-6">
+		<h3>Rename vault</h3>
+		<label>New vault name</label>
+		<input type="text" ng-model="$parent.new_vault_name">
+		<button ng-click="saveVaultSettings()" tooltip="'Not working :P'">Change</button>
+
+
 		<h3>Change vault key</h3>
 		<label>Old vault password</label>
 		<input type="password" ng-model="oldVaultPass">