diff --git a/src/app/directives/totpDirective.js b/src/app/directives/totpDirective.js
index 16327358..5b3d2dfb 100644
--- a/src/app/directives/totpDirective.js
+++ b/src/app/directives/totpDirective.js
@@ -164,6 +164,12 @@ angular
                     }, 1000);
                 });
 
+                scope.$on("$destroy", function () {
+                    if (interval) {
+                        clearInterval(interval);
+                    }
+                });
+
                 scope.clipboardError = function (e) {
                     alert('Your web browser does not support easy clipboard copying.');
                 };
diff --git a/src/app/vault/vaultAttachmentsController.js b/src/app/vault/vaultAttachmentsController.js
index f7abc6ca..af718e1a 100644
--- a/src/app/vault/vaultAttachmentsController.js
+++ b/src/app/vault/vaultAttachmentsController.js
@@ -31,7 +31,7 @@
                 return apiService.ciphers.postAttachment({ id: loginId }, fd).$promise;
             }).then(function (response) {
                 $analytics.eventTrack('Added Attachment');
-                toastr.success('The attachment has been added.');
+                toastr.success('The attachment has been saved.');
                 closing = true;
                 $uibModalInstance.close(true);
             }, function (err) {