diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 2c962574f97..3d43a4aa180 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -21,7 +21,7 @@
 
 {{#conditional-loading-spinner condition=refreshing}}
   {{#if model}}
-    <table class='table'>
+    <table class='table users-list'>
       <tr>
         {{#if showApproval}}
           <th>{{input type="checkbox" checked=selectAll}}</th>
@@ -42,7 +42,7 @@
       </tr>
 
       {{#each user in model}}
-        <tr {{bind-attr class="user.selected user.active::not-activated"}}>
+        <tr {{bind-attr class=":user user.selected user.active::not-activated"}}>
           {{#if controller.showApproval}}
             <td>
               {{#if user.can_approve}}
@@ -52,7 +52,7 @@
           {{/if}}
           <td><a href="{{unbound user.path}}" data-user-card="{{unbound user.username}}">{{avatar user imageSize="small"}}</a></td>
           <td>{{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}}</td>
-          <td>{{{unbound user.email}}}</td>
+          <td class='email'>{{unbound user.email}}</td>
           <td>{{{unbound user.last_emailed_age}}}</td>
           <td>{{{unbound user.last_seen_age}}}</td>
           <td>{{{unbound user.topics_entered}}}</td>
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index cd81f119c01..84a91034118 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -63,11 +63,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
         // Successful login
         if (result.error) {
           self.set('loggingIn', false);
-          if( result.reason === 'not_activated' ) {
+          if (result.reason === 'not_activated') {
             self.send('showNotActivated', {
               username: self.get('loginName'),
-              sentTo: result.sent_to_email,
-              currentEmail: result.current_email
+              sentTo: escape(result.sent_to_email),
+              currentEmail: escape(result.current_email)
             });
           } else if (result.reason === 'suspended' ) {
             self.send("closeModal");
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index f8df2639e9d..9d6620cbca6 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -3,7 +3,7 @@
     {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
   {{else}}
     {{{i18n 'login.not_activated' sentTo=sentTo}}}
-    <a href {{action "sendActivationEmail"}}>{{i18n 'login.resend_activation_email'}}</a>
+    <a href {{action "sendActivationEmail"}} class="resend-link">{{i18n 'login.resend_activation_email'}}</a>
   {{/if}}
 </div>
 <div class="modal-footer">
diff --git a/app/services/user_activator.rb b/app/services/user_activator.rb
index f5ba7a3703d..471a7913e0c 100644
--- a/app/services/user_activator.rb
+++ b/app/services/user_activator.rb
@@ -51,7 +51,7 @@ class EmailActivator < UserActivator
       user_id: user.id,
       email_token: email_token.token
     )
-    I18n.t("login.activate_email", email: user.email)
+    I18n.t("login.activate_email", email: Rack::Utils.escape_html(user.email))
   end
 end
 
diff --git a/spec/services/user_activator_spec.rb b/spec/services/user_activator_spec.rb
index 928c760f1ba..361dd9111a5 100644
--- a/spec/services/user_activator_spec.rb
+++ b/spec/services/user_activator_spec.rb
@@ -27,5 +27,15 @@ describe UserActivator do
       user.reload
       expect(user.email_tokens.last.created_at).to be_within_one_second_of(Time.zone.now)
     end
+
+    it "escapes the email in the message" do
+      user = Fabricate(:user, email: '<strike>eviltrout@example.com</strike>')
+      activator = EmailActivator.new(user, nil, nil, nil)
+      msg = activator.activate
+
+      expect(msg).to match(/eviltrout@example.com/)
+      expect(msg).not_to match(/<strike>/)
+    end
+
   end
 end
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js.es6
new file mode 100644
index 00000000000..a391ff9b731
--- /dev/null
+++ b/test/javascripts/acceptance/admin-users-list-test.js.es6
@@ -0,0 +1,11 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Admin - Users List", { loggedIn: true });
+
+test("lists users", () => {
+  visit("/admin/users/list/active");
+  andThen(() => {
+    ok(exists('.users-list .user'));
+    ok(!exists('.user:eq(0) .email small'), 'escapes email');
+  });
+});
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js.es6
index 32ee35b0310..3c80b6a416c 100644
--- a/test/javascripts/acceptance/sign-in-test.js.es6
+++ b/test/javascripts/acceptance/sign-in-test.js.es6
@@ -13,7 +13,7 @@ test("sign in", () => {
   fillIn('#login-account-password', 'incorrect');
   click('.modal-footer .btn-primary');
   andThen(() => {
-    ok(exists('#modal-alert:visible', 'it displays the login error'));
+    ok(exists('#modal-alert:visible'), 'it displays the login error');
     not(exists('.modal-footer .btn-primary:disabled'), "enables the login button");
   });
 
@@ -25,6 +25,31 @@ test("sign in", () => {
   });
 });
 
+test("sign in - not activated", () => {
+  visit("/");
+  andThen(() => {
+    click("header .login-button");
+    andThen(() => {
+      ok(exists('.login-modal'), "it shows the login modal");
+    });
+
+    fillIn('#login-account-name', 'eviltrout');
+    fillIn('#login-account-password', 'not-activated');
+    click('.modal-footer .btn-primary');
+    andThen(() => {
+      ok(!exists('.modal-body small'), 'it escapes the email address');
+    });
+
+    click('.modal-body .resend-link');
+    andThen(() => {
+      ok(!exists('.modal-body small'), 'it escapes the email address');
+    });
+
+
+  });
+});
+
+
 test("create account", () => {
   visit("/");
   click("header .sign-up-button");
@@ -55,5 +80,4 @@ test("create account", () => {
   andThen(() => {
     ok(exists('.modal-footer .btn-primary:disabled'), "create account is disabled");
   });
-
 });
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index d936c3c7720..03b7edca42f 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -130,9 +130,19 @@ export default function() {
       if (data.password === 'correct') {
         return response({username: 'eviltrout'});
       }
+
+      if (data.password === 'not-activated') {
+        return response({ error: "not active",
+                          reason: "not_activated",
+                          sent_to_email: '<small>eviltrout@example.com</small>',
+                          current_email: '<small>current@example.com</small>' });
+      }
+
       return response(400, {error: 'invalid login'});
     });
 
+    this.post('/users/action/send_activation_email', success);
+
     this.get('/users/hp.json', function() {
       return response({"value":"32faff1b1ef1ac3","challenge":"61a3de0ccf086fb9604b76e884d75801"});
     });
@@ -208,6 +218,13 @@ export default function() {
 
     const siteText = {id: 'site.test', value: 'Test McTest'};
     const overridden = {id: 'site.overridden', value: 'Overridden', overridden: true };
+
+    this.get('/admin/users/list/active.json', () => {
+      return response(200, [
+        {id: 1, username: 'eviltrout', email: '<small>eviltrout@example.com</small>'}
+      ]);
+    });
+
     this.get('/admin/customize/site_texts', request => {
 
       if (request.queryParams.overridden) {