diff --git a/js/templates.js b/js/templates.js
index ac0a8f17..403582b8 100644
--- a/js/templates.js
+++ b/js/templates.js
@@ -63,7 +63,7 @@ angular.module('views/partials/forms/settings/import.html', []).run(['$templateC
 angular.module('views/partials/forms/settings/sharing.html', []).run(['$templateCache', function($templateCache) {
   'use strict';
   $templateCache.put('views/partials/forms/settings/sharing.html',
-    '<div ng-controller="SharingSettingsCtrl"><div class="row"><div class="col-md-6"><label>Private Key</label><textarea class="col-md-12">{{active_vault.private_sharing_key}}</textarea></div><div class="col-md-6"><label>Public key</label><textarea class="col-md-12">{{active_vault.public_sharing_key}}</textarea></div></div><div class="row"><div class="col-md-12"><label>Key size<select ng-model="key_size"><option value="512">512</option><option value="1024">1024</option><option value="2048">2048</option><option value="4096">4096</option></select><button ng-if="!generating" ng-click="generateKeys(key_size)">Generate sharing keys</button> <button ng-if="generating"><i class="fa fa-spinner fa-spin"></i> Generating sharing keys step {{progress}}/2</button></label></div></div></div>');
+    '<div ng-controller="SharingSettingsCtrl"><div class="row"><div class="col-md-6"><label>Private Key</label><textarea class="col-md-12">{{active_vault.private_sharing_key}}</textarea></div><div class="col-md-6"><label>Public key</label><textarea class="col-md-12">{{active_vault.public_sharing_key}}</textarea></div></div><div class="row"><div class="col-md-12"><label>Key size<select ng-model="key_size"><option value="512">512</option><option value="1024">1024</option><option value="2048">2048</option><option value="4096">4096</option></select><button ng-if="!generating" ng-click="generateKeys(key_size)">Generate sharing keys</button> <button ng-if="generating"><i class="fa fa-spinner fa-spin"></i> Generating sharing keys step {{progress}}/2</button></label></div></div></div>{{active_vault}}');
 }]);
 
 angular.module('views/partials/forms/settings/tool.html', []).run(['$templateCache', function($templateCache) {
diff --git a/lib/Db/Vault.php b/lib/Db/Vault.php
index 67dc7833..fc33d60b 100644
--- a/lib/Db/Vault.php
+++ b/lib/Db/Vault.php
@@ -62,6 +62,7 @@ class Vault extends Entity implements  \JsonSerializable{
 			'created' => $this->getCreated(),
 			'private_sharing_key' => $this->getPrivateSharingKey(),
 			'public_sharing_key' => $this->getPublicSharingKey(),
+			'sharing_keys_generated' => $this->getSharingKeysGenerated(),
 			'last_access' => $this->getlastAccess(),
 		];
 	}
diff --git a/lib/Db/VaultMapper.php b/lib/Db/VaultMapper.php
index 614914cf..0eadd459 100644
--- a/lib/Db/VaultMapper.php
+++ b/lib/Db/VaultMapper.php
@@ -33,7 +33,7 @@ class VaultMapper extends Mapper {
 	}
 
 	public function findVaultsFromUser($userId){
-		$sql = 'SELECT id, name, created, guid, last_access FROM `*PREFIX*passman_vaults` ' .
+		$sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' .
 			'WHERE `user_id` = ? ';
 		$params = [$userId];
 		return $this->findEntities($sql, $params);
diff --git a/templates/views/partials/forms/settings/sharing.html b/templates/views/partials/forms/settings/sharing.html
index 88728811..05a981e7 100644
--- a/templates/views/partials/forms/settings/sharing.html
+++ b/templates/views/partials/forms/settings/sharing.html
@@ -24,4 +24,5 @@
             </label>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+{{active_vault}}
\ No newline at end of file