Merge pull request #8516 from RocketChat/hotfix/cant-change-password

Fix: Change password not working in new UI
RocketChat · Oct 17, 2017 · 88c8ae0 · 88c8ae0
2 parents 737abc3 + e0db8ce
commit 88c8ae0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/rocketchat-ui-account/client/accountProfile.js b/packages/rocketchat-ui-account/client/accountProfile.js
@@ -79,6 +79,7 @@ Template.accountProfile.helpers({
 		instance.dep.depend();
 		const realname = instance.realname.get();
 		const username = instance.username.get();
+		const password = instance.password.get();
 		const email = instance.email.get();
 		const usernameAvaliable = instance.usernameAvaliable.get();
 		const avatar = instance.avatar.get();
@@ -93,7 +94,7 @@ Template.accountProfile.helpers({
 				return;
 			}
 		}
-		if (!avatar && user.name === realname && user.username === username && user.emails[0].address === email) {
+		if (!avatar && user.name === realname && user.username === username && user.emails[0].address === email && !password) {
 			return ret;
 		}
 		if (!validateEmail(email) || (!validateUsername(username) || usernameAvaliable !== true) || !validateName(realname)) {
@@ -236,6 +237,7 @@ Template.accountProfile.onCreated(function() {
 				toastr.success(t('Profile_saved_successfully'));
 				swal.close();
 				instance.clearForm();
+				self.password.set();
 			}
 			if (error) {
 				toastr.remove();