diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ba9606c9..bcc05c714 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,20 @@
-owncloud-passman (0.0.1)
-* **Security**: Security description here
-* **Backwards incompatible change**: Changes in the API
-* **New dependency**: New dependencies such as a new ownCloud or PHP version
-* **Bugfix**: Bugfix description
-* **Enhancement**: New feature description
\ No newline at end of file
+## [Unreleased]
+### Updated
+- Updated to passman 2.0.0
+
+## 2.0.0 – 2016-12-31
+### Added
+- Password sharing
+- Vaults
+- Change vault passwords
+- Unit tests
+
+### Changed
+- Passman API overhaul
+- Rewrite of code base
+- New passman repo at https://github.com/nextcloud/passman
+### Fixed
+- A lot of small bug fixes
+
+### Removed
+- Old passman API
diff --git a/js/app/controllers/settings.js b/js/app/controllers/settings.js
index 4ee899f0e..d439a3acb 100644
--- a/js/app/controllers/settings.js
+++ b/js/app/controllers/settings.js
@@ -203,6 +203,8 @@
 						$scope.error = $translate.instant('password.no.match');
 						return;
 					}
+					SettingsService.setSetting('defaultVault', null);
+					SettingsService.setSetting('defaultVaultPass', null);
 					VaultService.getVault($scope.active_vault).then(function (vault) {
 						var _selected_credentials = [];
 						if (vault.credentials.length === 0) {
@@ -210,8 +212,17 @@
 						}
 						for (var i = 0; i < vault.credentials.length; i++) {
 							var _credential = vault.credentials[i];
-							if (_credential.shared_key === null || _credential.shared_key === '') {
-								_selected_credentials.push(_credential);
+							if (_credential.shared_key === null || _credential.shared_key === '' || !_credential.hasOwnProperty('acl')) {
+								var _success;
+								try{
+									CredentialService.decryptCredential(_credential, VaultService.getActiveVault().vaultKey);
+									_success = true;
+								} catch (e){
+									_success = false;
+								}
+								if(_success) {
+									_selected_credentials.push(_credential);
+								}
 							}
 						}
 						$scope.change_pw = {