diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 7db0f9b3aae..f5b31411f97 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -69,8 +69,9 @@ export default DiscourseController.extend(ModalFunctionality, {
               sentTo: result.sent_to_email,
               currentEmail: result.current_email
             });
+          } else {
+            self.flash(result.error, 'error');
           }
-          self.flash(result.error, 'error');
         } else {
           self.set('loggedIn', true);
           // Trigger the browser's password manager using the hidden static login form:
diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js.es6
index 3ce160c8808..dd53320766d 100644
--- a/app/assets/javascripts/discourse/controllers/not-activated.js.es6
+++ b/app/assets/javascripts/discourse/controllers/not-activated.js.es6
@@ -4,6 +4,10 @@ import DiscourseController from 'discourse/controllers/controller';
 export default DiscourseController.extend(ModalFunctionality, {
   emailSent: false,
 
+  onShow() {
+    this.set("emailSent", false);
+  },
+
   actions: {
     sendActivationEmail: function() {
       Discourse.ajax('/users/action/send_activation_email', {data: {username: this.get('username')}, type: 'POST'});