diff --git a/jslib b/jslib
index 902d72457c..e3b3e444db 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 902d72457cbeb99ef5d9eb69945ad43658f69277
+Subproject commit e3b3e444dbff7e4541fa5367ee26bc7ed4d73b26
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 36639d4553..1df3866af0 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -982,12 +982,12 @@
     "message": "Complete your two-step login request using the new tab."
   },
   "checkPassword": {
-    "message": "Check if the password have been previously exposed."
+    "message": "Check if password has been exposed."
   },
   "passwordExposed": {
-    "message": "This password have been previously exposed in data breaches!"
+    "message": "This password has been exposed in data breaches. You should change it."
   },
   "passwordSafe": {
-    "message": "This password was not found in a current data breach! It should be safe to use."
+    "message": "This password was not found in any known data breaches. It should be safe to use."
   }
 }
diff --git a/src/popup/app/vault/vaultAddCipherController.js b/src/popup/app/vault/vaultAddCipherController.js
index 608f472ab3..5845c48399 100644
--- a/src/popup/app/vault/vaultAddCipherController.js
+++ b/src/popup/app/vault/vaultAddCipherController.js
@@ -94,18 +94,19 @@ angular
             $scope.showPassword = !$scope.showPassword;
         };
 
-        $scope.checkPassword = () => {
-            $analytics.eventTrack('Check Password');
+        $scope.checkPassword = function () {
+            if (!$scope.cipher.login || !$scope.cipher.login.password || $scope.cipher.login.password === '') {
+                return;
+            }
 
-            auditService
-                .passwordLeaked($scope.cipher.login.password)
-                .then((matches) => {
-                    if (matches != 0) {
-                        toastr.error(i18nService.passwordExposed, i18nService.errorsOccurred);
-                    } else {
-                        toastr.success(i18nService.passwordSafe)
-                    }
-                })
+            $analytics.eventTrack('Check Password');
+            auditService.passwordLeaked($scope.cipher.login.password).then(function (matches) {
+                if (matches != 0) {
+                    toastr.error(i18nService.passwordExposed);
+                } else {
+                    toastr.success(i18nService.passwordSafe);
+                }
+            });
         };
 
         $scope.addField = function (type) {
diff --git a/src/popup/app/vault/vaultEditCipherController.js b/src/popup/app/vault/vaultEditCipherController.js
index db41d72b5a..5890d72fa9 100644
--- a/src/popup/app/vault/vaultEditCipherController.js
+++ b/src/popup/app/vault/vaultEditCipherController.js
@@ -112,18 +112,19 @@ angular
             $scope.showPassword = !$scope.showPassword;
         };
 
-        $scope.checkPassword = () => {
-            $analytics.eventTrack('Check Password');
+        $scope.checkPassword = function () {
+            if (!$scope.cipher.login || !$scope.cipher.login.password || $scope.cipher.login.password === '') {
+                return;
+            }
 
-            auditService
-                .passwordLeaked($scope.cipher.login.password)
-                .then((matches) => {
-                    if (matches != 0) {
-                        toastr.error(i18nService.passwordExposed, i18nService.errorsOccurred);
-                    } else {
-                        toastr.success(i18nService.passwordSafe)
-                    }
-                })
+            $analytics.eventTrack('Check Password');
+            auditService.passwordLeaked($scope.cipher.login.password).then(function (matches) {
+                if (matches != 0) {
+                    toastr.error(i18nService.passwordExposed);
+                } else {
+                    toastr.success(i18nService.passwordSafe);
+                }
+            });
         };
 
         $scope.addField = function (type) {