From d4759d40563637cf88f81a756ec43ba799f04613 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 26 Jul 2017 09:35:30 -0400
Subject: [PATCH] fixes

---
 src/app/organization/organizationBillingController.js | 3 ++-
 src/app/settings/settingsChangeEmailController.js     | 4 +++-
 src/app/settings/settingsChangePasswordController.js  | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/organization/organizationBillingController.js b/src/app/organization/organizationBillingController.js
index e22764d941..7c01f80ad0 100644
--- a/src/app/organization/organizationBillingController.js
+++ b/src/app/organization/organizationBillingController.js
@@ -138,7 +138,8 @@
                         cancelledDate: org.Subscription.CancelledDate,
                         status: org.Subscription.Status,
                         cancelled: org.Subscription.Status === 'cancelled',
-                        markedForCancel: org.Subscription.Status === 'active' && org.Subscription.CancelledDate
+                        markedForCancel: (org.Subscription.Status === 'active' || org.Subscription.Status === 'trialing') &&
+                            org.Subscription.CancelledDate
                     };
                 }
 
diff --git a/src/app/settings/settingsChangeEmailController.js b/src/app/settings/settingsChangeEmailController.js
index 2283c1f07a..cc740fd424 100644
--- a/src/app/settings/settingsChangeEmailController.js
+++ b/src/app/settings/settingsChangeEmailController.js
@@ -24,7 +24,9 @@
                     // User is not using an enc key, let's make them one
                     $scope.tokenPromise = cipherService.updateKey(_masterPasswordHash, function () {
                         return requestToken();
-                    }, processError);
+                    }, function (err) {
+                        toastr.error('Something went wrong.', 'Oh No!');
+                    });
                 }
             });
         };
diff --git a/src/app/settings/settingsChangePasswordController.js b/src/app/settings/settingsChangePasswordController.js
index 73355360ea..d073c913ac 100644
--- a/src/app/settings/settingsChangePasswordController.js
+++ b/src/app/settings/settingsChangePasswordController.js
@@ -33,9 +33,11 @@
                 // User is not using an enc key, let's make them one
                 $scope.savePromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) {
                     return cipherService.updateKey(hash);
-                }, processError).then(function () {
+                }).then(function () {
                     return changePassword(model);
-                }, processError);
+                }, function (err) {
+                    toastr.error('Something went wrong.', 'Oh No!');
+                });
             }
         };