diff --git a/js/app/controllers/settings.js b/js/app/controllers/settings.js
index ae3ed298..24144bb7 100644
--- a/js/app/controllers/settings.js
+++ b/js/app/controllers/settings.js
@@ -180,7 +180,7 @@
 										var zxcvbn_result = zxcvbn(c.password);
 										if (zxcvbn_result.score <= minStrength) {
 											results.push({
-												credential_id: c.credential_id,
+												guid: c.guid,
 												label: c.label,
 												password: c.password,
 												password_zxcvbn_result: zxcvbn_result
diff --git a/js/templates.js b/js/templates.js
index 2f3f9f86..9dd11700 100644
--- a/js/templates.js
+++ b/js/templates.js
@@ -87,7 +87,7 @@ angular.module('views/partials/forms/settings/sharing.html', []).run(['$template
 angular.module('views/partials/forms/settings/tool.html', []).run(['$templateCache', function ($templateCache) {
   'use strict';
   $templateCache.put('views/partials/forms/settings/tool.html',
-    '<div class="row"><div class="col-xs-12"><p>{{ \'tool.intro\' | translate}}</p></div><div class="col-xs-12" ng-init="minStrength = 3;">{{ \'min.strength\' | translate}} <input type="number" min="1" max="4" value="3" ng-model="minStrength"> <button ng-click="startScan(minStrength)">Start scan</button></div></div><div class="row" ng-show="scan_result"><div class="col-xs-12"><p>{{ \'scan.result.msg\' | translate}}<br><span translate="scan.result" translate-values="{ scan_result: scan_result.length}"></span><br></p><table class="table scan-result-table"><thead><tr><td>{{ \'label\' | translate}}</td><td>{{ \'score\' | translate}}</td><td>{{ \'password\' | translate}}</td><td>{{ \'action\' | translate}}</td></tr></thead><tbody><tr ng-repeat="result in scan_result | orderBy:\'password_zxcvbn_result.score\'"><td>{{result.label}}</td><td class="score"><ng-password-meter password="result.password"></ng-password-meter></td><td><span credential-field value="result.password" secret="\'true\'"></span></td><td><a class="link" ng-href="#/vault/{{active_vault.vault_id}}/edit/{{result.guid}}" tooltip="\'Edit credential\'"><i class="fa fa-edit"></i></a></td></tr></tbody></table></div></div>');
+    '<div class="row"><div class="col-xs-12"><p>{{ \'tool.intro\' | translate}}</p></div><div class="col-xs-12" ng-init="minStrength = 3;">{{ \'min.strength\' | translate}} <input type="number" min="1" max="4" value="3" ng-model="minStrength"> <button ng-click="startScan(minStrength)">Start scan</button></div></div><div class="row" ng-show="scan_result"><div class="col-xs-12"><p>{{ \'scan.result.msg\' | translate}}<br><span translate="scan.result" translate-values="{ scan_result: scan_result.length}"></span><br></p><table class="table scan-result-table"><thead><tr><td>{{ \'label\' | translate}}</td><td>{{ \'score\' | translate}}</td><td>{{ \'password\' | translate}}</td><td>{{ \'action\' | translate}}</td></tr></thead><tbody><tr ng-repeat="result in scan_result | orderBy:\'password_zxcvbn_result.score\'"><td>{{result.label}}</td><td class="score"><ng-password-meter password="result.password"></ng-password-meter></td><td><span credential-field value="result.password" secret="\'true\'"></span></td><td><a class="link" ng-href="#/vault/{{active_vault.guid}}/edit/{{result.guid}}" tooltip="\'Edit credential\'"><i class="fa fa-edit"></i></a></td></tr></tbody></table></div></div>');
 }]);
 
 angular.module('views/partials/forms/share_credential/basics.html', []).run(['$templateCache', function ($templateCache) {
diff --git a/templates/views/partials/forms/settings/tool.html b/templates/views/partials/forms/settings/tool.html
index c176319a..d407fa62 100644
--- a/templates/views/partials/forms/settings/tool.html
+++ b/templates/views/partials/forms/settings/tool.html
@@ -36,7 +36,7 @@
 						  secret="'true'"></span>
 				</td>
 				<td>
-					<a class="link" ng-href="#/vault/{{active_vault.vault_id}}/edit/{{result.guid}}" tooltip="'Edit credential'"><i  class="fa fa-edit"></i></a>
+					<a class="link" ng-href="#/vault/{{active_vault.guid}}/edit/{{result.guid}}" tooltip="'Edit credential'"><i  class="fa fa-edit"></i></a>
 				</td>
 			</tr>
 			</tbody>