Merge branch 'master' into fix_for_2377

1 files changed, 9 insertions, 1 deletions

diff --git a/settings/js/users.js b/settings/js/users.js
index 690c9ad0464..f3fab34b090 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -351,10 +351,14 @@ $(document).ready(function () {
 		input.keypress(function (event) {
 			if (event.keyCode == 13) {
 				if ($(this).val().length > 0) {
+					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
 					$.post(
 						OC.filePath('settings', 'ajax', 'changepassword.php'),
-						{username: uid, password: $(this).val()},
+						{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
 						function (result) {
+							if (result.status != 'success') {
+								OC.Notification.show(t('admin', result.data.message));
+							}
 						}
 					);
 					input.blur();
@@ -368,6 +372,10 @@ $(document).ready(function () {
 			img.css('display', '');
 		});
 	});
+	$('input:password[id="recoveryPassword"]').keyup(function(event) {
+		OC.Notification.hide();
+	});
+
 	$('table').on('click', 'td.password', function (event) {
 		$(this).children('img').click();
 	});