diff --git a/packages/accounts-ui/login_buttons.html b/packages/accounts-ui/login_buttons.html
index 559400164b..2c0c53a829 100644
--- a/packages/accounts-ui/login_buttons.html
+++ b/packages/accounts-ui/login_buttons.html
@@ -134,9 +134,13 @@
 
     {{> loginButtonsMessages}}
 
-    <div class="login-button login-button-form-submit" id="reset-password-button">
+    <div class="login-button login-button-form-submit" id="login-buttons-reset-password-button">
       Reset password
     </div>
+
+    <a class="additional-link" id="login-buttons-cancel-reset-password">
+      Cancel
+    </a>
   </div>
   {{/if}}
 </template>
diff --git a/packages/accounts-ui/login_buttons.js b/packages/accounts-ui/login_buttons.js
index ca38a51651..b1dbca0bea 100644
--- a/packages/accounts-ui/login_buttons.js
+++ b/packages/accounts-ui/login_buttons.js
@@ -223,12 +223,16 @@
   //
 
   Template.resetPasswordForm.events = {
-    'click #reset-password-button': function () {
+    'click #login-buttons-reset-password-button': function () {
       resetPassword();
     },
-    'keypress #reset-password-new-password': function (event) {
+    'keypress #login-buttons-reset-password-new-password': function (event) {
       if (event.keyCode === 13)
         resetPassword();
+    },
+    'click #login-buttons-cancel-reset-password': function () {
+      Session.set(RESET_PASSWORD_TOKEN_KEY, null);
+      Meteor.accounts._preventAutoLogin = false;
     }
   };
 
diff --git a/packages/accounts-ui/login_buttons.less b/packages/accounts-ui/login_buttons.less
index c28601f8ce..1b467f6d7a 100644
--- a/packages/accounts-ui/login_buttons.less
+++ b/packages/accounts-ui/login_buttons.less
@@ -66,7 +66,7 @@
     position: relative;
 }
 
-#login-buttons a {
+#login-buttons a, .accounts-dialog a {
     cursor: pointer;
     text-decoration: underline;
 }
@@ -157,10 +157,14 @@
     color: green;
 }
 
-#login-buttons .additional-link {
+.accounts-dialog .additional-link {
     font-size: 60%;
 }
 
+.accounts-dialog #login-buttons-cancel-reset-password {
+    float: right;
+}
+
 #login-buttons #signup-link {
     float: right;
 }