diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index be6f41fc..0ad511aa 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -105,9 +105,6 @@
 							}
 							angular.merge($scope.active_vault.credentials, _credentials);
 							$scope.show_spinner = false;
-
-							console.log($scope.active_vault.credentials)
-
 							$rootScope.$broadcast('credentials_loaded');
 							$rootScope.vaultCache[$scope.active_vault.guid] = angular.copy($scope.active_vault);
 							if(!vault.private_sharing_key){
diff --git a/js/app/controllers/edit_credential.js b/js/app/controllers/edit_credential.js
index 20c5df91..40842a4a 100644
--- a/js/app/controllers/edit_credential.js
+++ b/js/app/controllers/edit_credential.js
@@ -113,6 +113,9 @@
 					$scope.storedCredential.expire_time = $scope.storedCredential.expire_time * 1000;
 				}
 
+				//store password to check if it was changed if this credential has been compromised
+				$scope.oldPassword=$scope.storedCredential.password;
+
 				$scope.getTags = function ($query) {
 					return TagService.searchTag($query);
 				};
@@ -301,6 +304,12 @@
 				$scope.saveCredential = function () {
 					$scope.saving = true;
 
+					if($scope.storedCredential.compromised){
+						if($scope.oldPassword !== $scope.storedCredential.password){
+							$scope.storedCredential.compromised=false;
+						}
+					}
+
 					if ($scope.new_custom_field.label && $scope.new_custom_field.value) {
 						$scope.storedCredential.custom_fields.push(angular.copy($scope.new_custom_field));
 					}