From 06ec7812a9e1987f665b0b3b125e4c097c84d63a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 11 Sep 2018 13:48:11 -0300
Subject: [PATCH] [FIX] Reset password link error if already logged in (#12022)

---
 .../rocketchat-ui-login/client/reset-password/resetPassword.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js
index 9749beb8abbe..f5fe6b12420a 100644
--- a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js
+++ b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js
@@ -29,7 +29,7 @@ Template.resetPassword.events({
 		const button = instance.$('button.resetpass');
 		RocketChat.Button.loading(button);
 
-		if (Meteor.userId()) {
+		if (Meteor.userId() && !FlowRouter.getParam('token')) {
 			Meteor.call('setUserPassword', instance.find('[name=newPassword]').value, function(error) {
 				if (error) {
 					console.log(error);